]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'drop-experimental/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 03:47:12 +0000 (14:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 03:47:12 +0000 (14:47 +1100)
commit6fd42eb01dabc20dd9f490db8883a259b62e3d9f
tree6e6c063490443f4c5d25c1b04c2c894a78a1a249
parentd09eb756245fcf9ea7f85b2095ee3c56436a37b0
parentf5c93a1b354a1c4dfb3dfd8cc70783f1e279c812
Merge remote-tracking branch 'drop-experimental/linux-next'

Conflicts:
drivers/net/ethernet/intel/Kconfig
drivers/ptp/Kconfig
arch/ia64/Kconfig
arch/x86/Kconfig
arch/x86/um/Kconfig
crypto/Kconfig
drivers/mmc/host/Kconfig
drivers/net/ethernet/intel/Kconfig
drivers/net/ethernet/ti/Kconfig
drivers/net/usb/Kconfig
init/Kconfig
net/mac80211/Kconfig
net/sctp/Kconfig