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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 343c1f0 92b19da)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 4 Dec 2011 23:46:13 +0000 (10:46 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 4 Dec 2011 23:46:13 +0000 (10:46 +1100)
commit	edfa55445659638bee5d90d7ecb81ef8b1ac6df5
tree	b6adc04cbfa97a0c2f5bf4fd5bf0ff30e8f06171	tree \| snapshot
parent	343c1f05ab77779f310c2417d5edb1df7466ccb2	commit \| diff
parent	92b19da8f67798a99778b08960380893ef08a480	commit \| diff

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

Conflicts:
arch/arm/plat-omap/include/plat/common.h
arch/arm/tools/mach-types

18 files changed:

arch/arm/mach-highbank/highbank.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx6q.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/gplugd.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-ams-delta.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/pm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/smartreflex.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/balloon3.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/colibri-pxa320.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/gumstix.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/palmtc.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/vpac270.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/include/mach/common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/include/mach/system.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/system.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/plat/common.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules