| commit | 486699532e43460234cbebc19cbebd2755b67da3 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Aug 31 14:12:19 2010 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Aug 31 14:12:19 2010 -0400 |
| tree | 0983829da193c1d222f6a52d94849f24111879d8 | |
| parent | 5b714c6a3753dad0798a70a049e15c7f6bc9446b [diff] | |
| parent | d0fe478c9f42dbc4916aa8d1d7a05d7f669d2209 [diff] |
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6