]> 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>
Wed, 7 Nov 2012 04:04:54 +0000 (15:04 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Nov 2012 04:04:54 +0000 (15:04 +1100)
commitf1e4774d842e7c5460e6293d6b7ce7984f3679e8
tree95e0708b0767937d6420552fbedb78715d49f346
parent5d83931de331b70740830bc1680bbf70b248a809
parentf5fd981d4da687f8382778fc53c2be38a508b913
Merge remote-tracking branch 'drop-experimental/linux-next'

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