| commit | a4881cc45a3fab4488e16c4934e149cfa620f1a9 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu Aug 23 09:49:42 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu Aug 23 09:49:42 2012 -0400 |
| tree | 653eaec2c015a52ba17b4e1b714251b9472925ec | |
| parent | 6de3f7e911d27d6737c79b3f6b5069044ea408ec [diff] | |
| parent | aba4e6fff8de0c92e53f0e7ef077231e75f7d760 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next