Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 31 Aug 2010 18:12:19 +0000 (14:12 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 31 Aug 2010 18:12:19 +0000 (14:12 -0400)
commit486699532e43460234cbebc19cbebd2755b67da3
tree0983829da193c1d222f6a52d94849f24111879d8
parent5b714c6a3753dad0798a70a049e15c7f6bc9446b
parentd0fe478c9f42dbc4916aa8d1d7a05d7f669d2209
Merge branch 'wireless-next-2.6' of git://git./linux/kernel/git/iwlwifi/iwlwifi-2.6