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: 378c352 adafc75)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 7 Oct 2011 03:07:56 +0000 (14:07 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 7 Oct 2011 03:07:56 +0000 (14:07 +1100)
commit	ed78e29944beb3cf1341a91fd5bf528071a0ce9e
tree	849bc68cfe3e2574d7ad00832fe7eb8f45c1aa9c	tree \| snapshot
parent	378c3523ab6674bc0a7ddc76e47281811a0e4399	commit \| diff
parent	adafc753b0e607fa5ec672a7d18b9ec346e4d117	commit \| diff

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

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

16 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
drivers/mfd/wm8994-core.c	diff1 \|	diff2 \|	blob \| history
include/linux/mfd/wm8994/core.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules