| commit | 933faa43ab9c1545c53ea082a8e4e1d1859568aa | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed May 29 14:51:50 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed May 29 14:51:50 2013 -0400 |
| tree | 933a7e52081af4cb32699587cb79173537f6c638 | |
| parent | 531efffc3e3ff52d732c8fa6f32e084e9c447612 [diff] | |
| parent | 6abb9cb99f33b20c2f32f18a3ae9cc7543e46edb [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next