]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kbuild/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 4 Nov 2011 02:34:08 +0000 (13:34 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 4 Nov 2011 02:34:08 +0000 (13:34 +1100)
commite1529e2061e2b54df6f078596ab1a675ff213d58
treeee0cc0900d9da0b02bdc7ef431ed91b88224dec1
parent402759b524d26410f9372b8eb13fa24ae6b87692
parent57b742f7722aeb63e719b6f92f42d482e025fc68
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/x86/Kconfig
arch/x86/um/Kconfig
drivers/net/ethernet/stmicro/stmmac/Kconfig
drivers/pci/Kconfig
drivers/scsi/Kconfig
scripts/checkpatch.pl