| commit | d1f10302568221c20628200bc8baa426c55f61c0 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Oct 29 14:52:04 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Oct 29 14:52:04 2012 -0400 |
| tree | 5eeb95d847924ec587e5e9a47ea2d2275d37635f | |
| parent | 9b34f40c20111ba658f88e1669598db494be1fbc [diff] | |
| parent | 1724ffbc7439de679d536163e03f54f35574d449 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next