| commit | b1f90866fb3a329b1c4ebfff93ae9c110943e50a | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Apr 12 15:20:53 2010 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Apr 12 15:20:53 2010 -0400 |
| tree | 9c765f6d21c8cad4906a2d1eb1b26f4f9842a3d6 | |
| parent | 68dd5b7a45d1935fcd32b786e8d3d3f7bb4bbfe7 [diff] | |
| parent | 470058e0ad82fcfaaffd57307d8bf8c094e8e9d7 [diff] |
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6