]> 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, 19 Dec 2011 02:41:02 +0000 (13:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 02:41:02 +0000 (13:41 +1100)
commit80b45732b26cabf416702f57147fbd5164851f9e
tree8b73e0027c64070f7f1bdb669ba94666378fc5d6
parentb9c9c43525ed830647457f3cfc74c288bdda8dc0
parentd1d182e00d72300e05b18e28372fab003d8d4a58
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
12 files changed:
Documentation/feature-removal-schedule.txt
MAINTAINERS
drivers/net/ethernet/Makefile
drivers/net/ethernet/marvell/mv643xx_eth.c
drivers/net/ethernet/micrel/ks8842.c
drivers/net/ethernet/natsemi/macsonic.c
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
net/nfc/nci/core.c
net/sunrpc/svc.c
net/sunrpc/svc_xprt.c
net/sunrpc/svcsock.c