]> 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>
Tue, 13 Nov 2012 04:49:18 +0000 (15:49 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Nov 2012 04:49:18 +0000 (15:49 +1100)
commitb6ff140ebe29241846e3b5578777a80d5e435c7d
tree27aecad362526398a4caad80fde9ee906070e7c3
parenta817962e1e3c753fbd482008c4c2c49823c3a2a9
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