commit | 0374737727b65f31b9357051b421a3141c0d39ec | [log] [tgz] |
---|---|---|
author | John W. Linville <linville@tuxdriver.com> | Fri Sep 07 14:50:15 2012 -0400 |
committer | John W. Linville <linville@tuxdriver.com> | Fri Sep 07 14:50:15 2012 -0400 |
tree | 0b3cb3b10ce83232c154f277007479ea66f23182 | |
parent | 4a3e12fd7a106bdf092704ea10ff463d2309213a [diff] | |
parent | c5d472212024543e32cf3eea4381ab91b9f6b812 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next