Merge branch 'libertas' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
commit17cf8cc9439262cd90421435e0e8c7ab0af26833
authorJeff Garzik <jeff@garzik.org>
Fri, 11 May 2007 21:54:19 +0000 (11 17:54 -0400)
committerJeff Garzik <jeff@garzik.org>
Fri, 11 May 2007 21:54:19 +0000 (11 17:54 -0400)
tree51f3f9080a5180d0983450f6ac274227a81628b5
parent12414db11da8789d9a6b549c4899250f6e116630
parent4269e2ad83036e1d8c076b1f1348f879a93be008
Merge branch 'libertas' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream