]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kbuild/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Nov 2011 03:42:25 +0000 (14:42 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Nov 2011 03:42:25 +0000 (14:42 +1100)
commit486653d5fe7b83e80b752bd78e9a0a38c9fd3538
tree26dc801ddcd4b0535e67850b172d26dca2fe72a6
parent34732b93f04064a5530885ea076b3e81b4516588
parentdc774926d6d4f4c1f0ed69314889b2d7125a0f5b
Merge remote-tracking branch 'kbuild/for-next'

Conflicts:
drivers/net/ethernet/stmicro/stmmac/Kconfig
17 files changed:
Makefile
arch/alpha/Kconfig
arch/arm/mach-at91/Kconfig
arch/m32r/Kconfig
arch/mips/Kconfig
arch/openrisc/Kconfig
arch/powerpc/Kconfig
arch/powerpc/platforms/40x/Kconfig
arch/powerpc/platforms/Kconfig.cputype
arch/powerpc/platforms/wsp/Kconfig
arch/sparc/Kconfig
arch/um/Kconfig.x86
arch/x86/Kconfig
drivers/net/ethernet/stmicro/stmmac/Kconfig
drivers/pci/Kconfig
drivers/scsi/Kconfig
scripts/checkpatch.pl