Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Sat, 27 May 2006 01:26:22 +0000 (21:26 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 27 May 2006 01:26:22 +0000 (21:26 -0400)
commit8fc29ba65bd669b8f23a46b4760f3ba773e2a635
tree583f1fe4d46e19fe010ec50776191d7646b05f88
parentecd68853b852cdafb138f9c437f3a751fe7dc381
parent4541a5db0ba33d9c692e5b2f8d7805e336fabe7c
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes