]> 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, 6 Dec 2011 00:42:17 +0000 (11:42 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Dec 2011 00:42:17 +0000 (11:42 +1100)
commit91ef3c81f42562ef28ff13d45a7730927a93fec8
tree3818a573a7767318c843482489aeea037a6c5f08
parentb139f557ce825248f2bff886dc6d8e1093f9a7e2
parent17e6abeec4cb8df1e33ea0e2b889586c731a68be
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
13 files changed:
MAINTAINERS
drivers/net/ethernet/Makefile
drivers/net/ethernet/micrel/ks8842.c
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/iwlwifi/iwl-agn-sta.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-agn.h
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-core.h
net/ipv4/route.c
net/mac80211/main.c
net/mac80211/util.c
net/wireless/reg.c