]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'drop-experimental/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Nov 2012 04:51:03 +0000 (15:51 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Nov 2012 04:51:03 +0000 (15:51 +1100)
commit47e40e8e1cc802c20f538176cac93660e3d72e0e
treed0422d9480d24c7cf14aa7e18130b10aba935c54
parentc9654f85855de149d2622f278d3e81238f79c51d
parent208411058fc79b7ecf8c5a45182b7ba288ef7c3e
Merge remote-tracking branch 'drop-experimental/linux-next'

Conflicts:
drivers/net/ethernet/intel/Kconfig
drivers/ptp/Kconfig
12 files changed:
arch/ia64/Kconfig
arch/s390/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