| commit | d07d152892aadd8dc3209ecef6788dfc83475676 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu Jul 12 15:21:05 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu Jul 12 15:21:05 2012 -0400 |
| tree | 0f140aa244ddc2c52494155342298cef64fc8456 | |
| parent | 2f8684ce7a47c91da7e0ccba2686277c103d02b6 [diff] | |
| parent | 685fb72b63faf09a767cc28332545f5830b91be8 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next Conflicts: drivers/net/wireless/iwmc3200wifi/cfg80211.c drivers/net/wireless/mwifiex/cfg80211.c