git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 9 Dec 2011 00:00:06 +0000 (11:00 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 9 Dec 2011 00:00:06 +0000 (11:00 +1100)
commit	d792ab854ce379e752788d2b2b1cd71efdb6e8a7
tree	7d7b24ce420b1c3cdfcd6b8bfa6fcd78219597fa	tree \| snapshot
parent	a48f5a4e948a4064230c23ee5c05b354a6ee62e3	commit \| diff
parent	1fc27d6c81c881a67fcd1ff983f23c06cdd2a93f	commit \| diff

Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/setup.c
arch/arm/mach-mxs/include/mach/common.h

69 files changed:

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91cap9.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91rm9200.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9260.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9261.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9263.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9g45.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9rl.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/generic.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/imx51-dt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/imx53-dt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-cpuimx51.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-cpuimx51sd.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx50_rdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx51_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx51_babbage.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx51_efikamx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx51_efikasb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx53_ard.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx53_evk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx53_loco.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx53_smd.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/aspenite.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/avengers_lite.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/brownstone.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/flint.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/gplugd.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/include/mach/pxa168.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/pxa168.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/tavorevb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/teton_bga.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/ttc_dkb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/include/mach/common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/mach-mx28evk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/balloon3.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/capc7117.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/cm-x2xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/cm-x300.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/colibri-pxa270.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/colibri-pxa300.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/colibri-pxa320.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/corgi.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/em-x270.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/eseries.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/hx4700.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/icontrol.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/idp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/littleton.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/lpd270.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/lubbock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/magician.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/mainstone.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/mioa701.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/poodle.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/raumfeld.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/saar.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/saarb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/spitz.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/stargate2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/tavorevb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/tavorevb3.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/tosa.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/viper.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/vpac270.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/z2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/zeus.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/zylonite.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Makefile	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91cap9.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91rm9200.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9260.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9261.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9263.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9g45.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9rl.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/generic.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/imx51-dt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/imx53-dt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-cpuimx51.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-cpuimx51sd.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx50_rdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx51_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx51_babbage.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx51_efikamx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx51_efikasb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx53_ard.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx53_evk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx53_loco.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx53_smd.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/aspenite.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/avengers_lite.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/brownstone.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/flint.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/gplugd.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/include/mach/pxa168.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/pxa168.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/tavorevb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/teton_bga.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/ttc_dkb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/include/mach/common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/mach-mx28evk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/balloon3.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/capc7117.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/cm-x2xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/cm-x300.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/colibri-pxa270.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/colibri-pxa300.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/colibri-pxa320.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/corgi.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/em-x270.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/eseries.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/hx4700.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/icontrol.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/idp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/littleton.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/lpd270.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/lubbock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/magician.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/mainstone.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/mioa701.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/poodle.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/raumfeld.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/saar.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/saarb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/spitz.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/stargate2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/tavorevb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/tavorevb3.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/tosa.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/viper.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/vpac270.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/z2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/zeus.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/zylonite.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Makefile	diff1 \|	diff2 \|	blob \| history