From: Jeff Garzik Date: Wed, 9 Aug 2006 03:48:48 +0000 (-0400) Subject: Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... X-Git-Tag: v2.6.18-rc5~122^2~1 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=2f96740c26f1dcff9111dca3e01379ab12aafde5;p=linux.git Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes --- 2f96740c26f1dcff9111dca3e01379ab12aafde5