]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'net/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Aug 2011 01:50:57 +0000 (11:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Aug 2011 01:51:05 +0000 (11:51 +1000)
commit73fadd9b6a9452774b3b21bf0c9cbd96c88c318a
tree6ce7b8db2c02d1ebb423711a52223376d5a7a29f
parent8b2cd83e651a55adc21d16edd0a75660a6fab442
parentca1ba7caa68520864e4b9227e67f3bbc6fed373b
Merge remote-tracking branch 'net/master'

Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
MAINTAINERS
arch/powerpc/Kconfig
arch/powerpc/configs/ppc40x_defconfig
arch/powerpc/configs/ppc64_defconfig
arch/powerpc/platforms/40x/Kconfig
drivers/infiniband/ulp/ipoib/ipoib_main.c
drivers/net/cris/eth_v10.c
drivers/net/ethernet/cadence/at91_ether.c