]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kbuild/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 03:29:57 +0000 (14:29 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 03:29:57 +0000 (14:29 +1100)
commit963a01821769da1a427957d2d59cc0c9562ef5ab
tree9142f4f15f5da46772ee0f152c1d9dcd13e60099
parent43180fa3ab295f935c1e3a7dfa19de6063801c33
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