]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'net-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 02:14:42 +0000 (13:14 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 02:14:42 +0000 (13:14 +1100)
commitea3180fd8af9b94dbbd7d2fe702468058358281c
tree67c8bfbc9c1b76834f98ca56bfba136e1769a574
parent012d09f1e3240c19f91b472b771b67b0bc822016
parentf33f1fccbf67b3d9b310a4b09114b7c670320ad4
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/ethernet/freescale/fsl_pq_mdio.c
12 files changed:
MAINTAINERS
drivers/bluetooth/btusb.c
drivers/net/ethernet/Makefile
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