| commit | 75c8ec71fb29ed59c4b9bda2f411ed3b09164cf7 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Nov 21 14:43:51 2012 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Nov 21 14:43:51 2012 -0500 |
| tree | c1dfd91e624b48ccefa71db573d043b639fe088f | |
| parent | 1e60896fe07307baa5f3ca1a220dfa9792657352 [diff] | |
| parent | 77d2ece6fde80631193054edc9c9a3edad519565 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next