| commit | 403e16731ffddc097eae89f53f9a7b0f0c9769c4 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu Dec 06 14:58:41 2012 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu Dec 06 14:58:41 2012 -0500 |
| tree | 228d17985ad8ea22a7763457bf9641eb44781568 | |
| parent | 55cb0797fa779e36f62876a8aa44cbf3984e8d59 [diff] | |
| parent | da29d2a5780d80857773d7776b7603a449b0b6e0 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next Conflicts: drivers/net/wireless/mwifiex/sta_ioctl.c net/mac80211/scan.c