Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 26 Jan 2011 21:12:47 +0000 (16:12 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 26 Jan 2011 21:12:47 +0000 (16:12 -0500)
commit62362dee83c2a50465cc64ba701ebd741996ec80
treeac639bf91e9dd10310cd79bde73d1137bbd78a57
parent97d9c3a354f9eb6b8bfe4bf672bdbe9ff76956e6
parentf35c0c560994226847fa33f0021046a44ab1460f
Merge branch 'wireless-next-2.6' of git://git./linux/kernel/git/iwlwifi/iwlwifi-2.6