| commit | edbe4073a84713c1c01a3f37fb880f151d0a5b68 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu Oct 07 14:40:26 2010 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu Oct 07 14:40:26 2010 -0400 |
| tree | 84b910c5af793c80c6671f414b30c122fa269732 | |
| parent | 7573eac762af253e0b61b60cce34ab80f2dd45c7 [diff] | |
| parent | cf9768d6a3f901b00fc9d8ecdf8e506d7cbcae99 [diff] |
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6