| commit | 1d7d969dd0b467ba32cf3829e8bf104a5084150d | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon May 03 14:53:49 2010 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon May 03 14:53:49 2010 -0400 |
| tree | f0de3aca8a33bed612ba2c09f61fcabe289dc14d | |
| parent | 12ef116bf750c221e214e33c61e7f4c98300b5fd [diff] | |
| parent | f8478df1eab2f11aefc4b6668c5867949ab96bd7 [diff] |
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6