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 2007-12-22 23:25:16 -05:00
commit 61c93f4eb4
5 changed files with 75 additions and 27 deletions