| commit | 42775a34d23027b19e984956a539448f5e7ff075 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu Mar 13 14:21:43 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu Mar 13 14:21:43 2014 -0400 |
| tree | e344340c7f0aed4c8faf7534fabbc64607a8e784 | |
| parent | 433131ba03c511a84e1fda5669c70cf8b44702e1 [diff] | |
| parent | 4e3b3bcd81776527fa6f11624d68849de8c8802e [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem Conflicts: drivers/net/wireless/ath/ath9k/recv.c