]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'wireless-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 01:53:28 +0000 (11:53 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 01:53:35 +0000 (11:53 +1000)
commit398364ea013d70785e638e533144bf30d89460e5
treefc1499528356f6e66e0d060140ab6f9ebc1ac021
parent606f51ab0ab6729d69535593ca6a7b0d5116cc75
parentf57d7b6c9db1f9e26da09694b5fcb5650547f7d2
Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/net/wireless/iwlwifi/iwl-testmode.c
include/net/nfc/nfc.h
13 files changed:
MAINTAINERS
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ipw2x00/ipw2100.c
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/iwlwifi/iwl-testmode.c
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/ti/wlcore/testmode.c
include/net/nfc/nfc.h
net/nfc/core.c
net/nfc/netlink.c
net/nfc/nfc.h
net/wireless/nl80211.c
net/wireless/util.c