tree 53cef142e48ca8453b3277a3b7452c53cdb54793
parent a041fe2e8d0bd749b2416ef79adc416e24af7c63
parent 53c5725581cce8a29925afd4eae71fa8c7ce551f
author Jeff Garzik <jeff@garzik.org> 1189898947 -0400
committer Jeff Garzik <jeff@garzik.org> 1189898947 -0400

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