Merge branch 'libertas' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <[email protected]>
Fri, 11 May 2007 21:54:19 +0000 (17:54 -0400)
committerJeff Garzik <[email protected]>
Fri, 11 May 2007 21:54:19 +0000 (17:54 -0400)

Trivial merge