| commit | 55d1cad2efe2e3567c3116f50ba10e5af1bc01fc | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri Jan 03 15:25:15 2014 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Jan 03 15:25:15 2014 -0500 |
| tree | 5d09fc11643739c5266250383cffbe577a562ee5 | |
| parent | 39731b78b4afebb7501c05b68e2443a1b250b41c [diff] | |
| parent | 32db6b54dfba38aa8fa4072b2a3fc6425139166a [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next