| commit | 62c8003ecb973986958e9dade4a7e598349caf48 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Nov 26 14:46:41 2012 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Nov 26 14:46:41 2012 -0500 |
| tree | 0e831639cd6449c2955234cfc37ef46481c788d1 | |
| parent | e4cb3ff9311e0817e65cda7bc53898348aab7527 [diff] | |
| parent | ec816087e8978b74c1bd5fae0e335dd97d964e9f [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next