| commit | 4a3e12fd7a106bdf092704ea10ff463d2309213a | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri Sep 07 14:49:46 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Sep 07 14:49:46 2012 -0400 |
| tree | 302f2f1c7cd7c370719fe5a69371c1f5a6a87157 | |
| parent | a4881cc45a3fab4488e16c4934e149cfa620f1a9 [diff] | |
| parent | 768be59f30f2ee8958ba3718101162c694efab12 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next