tree 583f1fe4d46e19fe010ec50776191d7646b05f88
parent ecd68853b852cdafb138f9c437f3a751fe7dc381
parent 4541a5db0ba33d9c692e5b2f8d7805e336fabe7c
author Jeff Garzik <jeff@garzik.org> 1148693182 -0400
committer Jeff Garzik <jeff@garzik.org> 1148693182 -0400

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