tree 859b78d64961ad92873e835ad1520caeb34b292f
parent c9b2ca735a7685fa8aafd17b3cf3f9f20449d10b
parent 1f06862e11f23ebc99438c592be9c92560d78548
author Jeff Garzik <jeff@garzik.org> 1192849490 -0400
committer Jeff Garzik <jeff@garzik.org> 1192849490 -0400

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