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

This commit is contained in:
Jeff Garzik 2007-07-16 17:59:03 -04:00
commit 5be8084673
22 changed files with 280 additions and 269 deletions