| commit | 9b4e9e756541fd5d1223b323ed5a8a8545dd11cd | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Sep 24 14:34:40 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Sep 24 14:34:40 2012 -0400 |
| tree | 3eed3a2582532bd1fd890b58eadd472fcd2b1dc7 | |
| parent | 7a5f799becc51c842ec1a3aeb8dd82651aea7036 [diff] | |
| parent | 9385d04f2872057a2029901190391fe192b18693 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next