| commit | 3cd17638fdf13d2f7fe76465cf74106e612af5eb | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri Oct 19 15:36:53 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Oct 19 15:36:53 2012 -0400 |
| tree | a19bff1c69430750894129c99404130f4fec689d | |
| parent | bc27d5f14363a1065bf9437a5bca5409492b6c06 [diff] | |
| parent | d012a605108a482392be80710ea35f1db27c4aa9 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next