]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'net-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 02:02:10 +0000 (13:02 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 02:14:06 +0000 (13:14 +1100)
commitcef8826c48c5f581ed1215da07120b12e20751e3
treed2d8af1b7ebdaeac818e9a026a14f7f7eb0ffbdd
parent62b804b9a2462bdbe556b0fa8b74e86041cc3706
parentb43faac69062f0fc75bd3230d67da64e184232d1
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/ethernet/freescale/fsl_pq_mdio.c
net/batman-adv/translation-table.c
19 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/ethernet/natsemi/macsonic.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/sched/sch_gred.c
net/sunrpc/svc.c
net/sunrpc/svc_xprt.c
net/sunrpc/svcsock.c