Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 23 Mar 2010 20:46:43 +0000 (16:46 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 23 Mar 2010 20:46:43 +0000 (16:46 -0400)
commitd82689e249266d64cd37429c9e1ff6346e5446ab
treebb614880633510d519353011c2849df6258a38bd
parent819bfecc4fc6b6e5a793f719a45b7146ce423b79
parentfa8f130c504223d25c116b3d23787f465dfb1317
Merge branch 'wireless-next-2.6' of git://git./linux/kernel/git/iwlwifi/iwlwifi-2.6