]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'net-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 00:55:01 +0000 (11:55 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 00:55:01 +0000 (11:55 +1100)
commit93cc55e181e9e0f1609d314f20b5bd5b092170e9
tree957a7465180eef070d41dd26e1f199df0ef2bbff
parent20b90d00e93e7ef20b3215e4d99f70e0a8f002f7
parent86e62ad6b2a49064a078d7f22fa81afdaecc1187
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/ethernet/freescale/fsl_pq_mdio.c
13 files changed:
MAINTAINERS
drivers/bluetooth/btusb.c
drivers/net/ethernet/Makefile
drivers/net/ethernet/freescale/fec.c
drivers/net/ethernet/micrel/ks8842.c
drivers/net/ppp/pptp.c
drivers/net/wireless/ath/ath9k/main.c
net/batman-adv/translation-table.c
net/bluetooth/bnep/core.c
net/bluetooth/cmtp/core.c
net/bluetooth/hci_event.c
net/mac80211/agg-tx.c
net/sunrpc/svcsock.c