Merge branch 'bcm43xx' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <jeff@garzik.org>
Thu, 3 Aug 2006 21:20:58 +0000 (17:20 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 3 Aug 2006 21:20:58 +0000 (17:20 -0400)
commitfd39c6889255f939d4010b249096b590549c9273
tree0cbe728eba60dcc76ab4b0a0d12d02780df0f0b6
parent23946a8a980d13af7b84bcf3ce023e0d166ec83f
parent73c1ac1e3b6c989b9b5f7b2313ac590a1c3b6d6a
Merge branch 'bcm43xx' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream