tree 2fad2f2025ca1d9e5bc88d4e835e07967b8fd762
parent 8a89334caf80bb7c86383b73fd5a528cb88c696f
parent 2638fed7ccb07ff43cdc109dd78e821efb629995
author Jeff Garzik <jeff@garzik.org> 1143671419 -0500
committer Jeff Garzik <jeff@garzik.org> 1143671419 -0500

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