]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'net-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 03:37:26 +0000 (14:37 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 03:37:26 +0000 (14:37 +1100)
commit2d3b2ab540312d9c6e302760f7e3e991873e5867
tree057d18a95436de38f5bbc4a6f5cba845743f7f2d
parent2d4632418186613e235fa1fa49972d8a610eba2f
parent08e34eb14fe4cfd934b5c169a7682a969457c4ea
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/ethernet/freescale/fsl_pq_mdio.c
17 files changed:
Documentation/feature-removal-schedule.txt
MAINTAINERS
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
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
net/batman-adv/translation-table.c
net/ipv4/ipip.c
net/ipv6/addrconf.c
net/ipv6/sit.c
net/mac80211/agg-tx.c
net/nfc/nci/core.c
net/sunrpc/svc.c
net/sunrpc/svc_xprt.c
net/sunrpc/svcsock.c