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: 7673c98 57b742f)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 7 Nov 2011 00:36:40 +0000 (11:36 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 7 Nov 2011 00:36:40 +0000 (11:36 +1100)
commit	e7d903e8a4f5f085f4f98e305026d927224c2d31
tree	d6041f161aee3423ce4ff35cf0c010c27de21164	tree \| snapshot
parent	7673c98b9847c6ee7563634965caf0308417089d	commit \| diff
parent	57b742f7722aeb63e719b6f92f42d482e025fc68	commit \| diff

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

Conflicts:
drivers/net/ethernet/stmicro/stmmac/Kconfig

17 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/alpha/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/m32r/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/openrisc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/40x/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/Kconfig.cputype	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/wsp/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/sparc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/um/Kconfig	diff1 \|	\|	blob \| history
drivers/net/ethernet/stmicro/stmmac/Kconfig	diff1 \|	\|	blob \| history
drivers/pci/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/scsi/Kconfig	diff1 \|	diff2 \|	blob \| history
scripts/checkpatch.pl	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules