| commit | 4b074b07625f603d40d4d04937f8874a00415dc4 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Dec 02 14:25:38 2013 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Dec 02 14:25:38 2013 -0500 |
| tree | 2dffdc46e3fea0320524f483cf5ac2c058ab59f2 | |
| parent | 7d68849f40cd9169088249cc889d95c8998c3fb8 [diff] | |
| parent | ddcc347b70f298f9d624cd0e250581d831d915fb [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next