| commit | 1a26904eb63150bba2120fc2864e9307d1500691 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu Aug 02 13:49:38 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu Aug 02 13:49:38 2012 -0400 |
| tree | b071dc0b08138a1f3d54972cc864b556c6995694 | |
| parent | e33cdac014d50dd9753e1399ae8b0b5cd98d7aa0 [diff] | |
| parent | 899852af60c212bfe9a2fb71d4d9082d2622df5c [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211