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: 57c6fee a959754)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 Sep 2011 02:01:31 +0000 (12:01 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 Sep 2011 02:01:31 +0000 (12:01 +1000)
commit	c0c6a84be9291f380d108e739eefc138298506d4
tree	e68708f56d971df67af860927192021d7ff0620a	tree \| snapshot
parent	57c6feebb00550aa8e22406598e5755a7c1c1590	commit \| diff
parent	a95975431b22cdb212fac726c45331825ba761c6	commit \| diff

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

Conflicts:
arch/arm/mach-u300/include/mach/irqs.h

14 files changed:

arch/arm/mach-imx/mach-mx27_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31lite.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31moboard.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-pcm038.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/mx51_efika.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3beagle.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-u300/include/mach/irqs.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/board-u5500.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mfd/menelaus.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules