| commit | 5807bae7eda2d6da673c9f9f52460c3fbcea556c | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Oct 12 15:52:25 2010 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Oct 12 15:52:25 2010 -0400 |
| tree | ff4d82a8ddacb81b96969e97c090a5b61c9c51df | |
| parent | a13c8f3133b250e732c383b1c390d625e755db03 [diff] | |
| parent | fd74d065f43f88eedc7492886d84f0accb683653 [diff] |
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6