Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes

This commit is contained in:
Jeff Garzik 2008-01-18 14:40:47 -05:00
commit 9559cc239d
6 changed files with 24 additions and 12 deletions