diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-06-04 14:56:01 +0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-06-04 15:02:42 +0400 |
| commit | 51217cee3a94d5409d6ee2ac090ae96bc9a06757 (patch) | |
| tree | 373c5ebf9e87ef81feb1d02feaf06f673fcf9a13 /Documentation/sound | |
| parent | ff40b425f04144771920b79672d6691910c7def7 (diff) | |
| parent | 99e94940697adec4f84758adb2db71f4a82c7ba5 (diff) | |
| download | linux-51217cee3a94d5409d6ee2ac090ae96bc9a06757.tar.xz | |
Merge remote-tracking branch 'wireless-next/master' into HEAD
Merge to get the wil6210 changes that a cfg80211 change needs.
A conflict in drivers/net/wireless/ath/ath9k/init.c was just
whitespace changes.
Also fix a semantic conflict due to cw1200 using WoWLAN which
I had modified in my tree.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'Documentation/sound')
0 files changed, 0 insertions, 0 deletions