tree 35e1340b05b295dbefefaa45424e00a55c28402e
parent f2ad2d9b65963322186a8af2bd2965c734a7badb
parent c576af479162c0a11d4e2691ebc97354958d9285
author Jeff Garzik <jeff@garzik.org> 1157554942 -0400
committer Jeff Garzik <jeff@garzik.org> 1157554942 -0400

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