Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Sat, 29 Jul 2006 04:32:29 +0000 (00:32 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 29 Jul 2006 04:32:29 +0000 (00:32 -0400)
commit5b84b6fa9b96d1598eb77196f9d8b3e62efac647
treec8bae5786c369e42ac7eba9191fbad0721bcd73c
parente3f2ddeac718c768fdac4b7fe69d465172f788a8
parentca0084fa90533687b6317e6d084141da87c74d5c
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes