| commit | 3e3cb6caea8a86cebfafed349184c125d563cbc1 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri Mar 14 14:33:19 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Mar 14 14:33:19 2014 -0400 |
| tree | 3c0100030687c63e6c31a49b1aa4c8fec35f45bf | |
| parent | 1698aca04085a98e0e22256c0a7f0e686d982084 [diff] | |
| parent | 82e5a649453a3cf23516277abb84273768a1592b [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes