| commit | d61bdbf1235b7a11b29197b538bbee41855eaf38 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue May 28 13:38:53 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue May 28 13:38:53 2013 -0400 |
| tree | e60008e184176ceb1d9db9da696326b18c3ccd15 | |
| parent | 86c157b3f83597e11d8f03a9dece98d1e77a8ce7 [diff] | |
| parent | ac20976dcaeea3e77e40e9aac8f3799d2a22ea2b [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211