tree 4f0dbdb1b18bf24987485facb5e7800e242d932f
parent e45d9ab4051d99c9f237c96e75c4dd6671661236
parent 46b8c85e1df091fe2d53ae7d02addb0dc58a9123
author Jeff Garzik <jeff@garzik.org> 1171055529 -0500
committer Jeff Garzik <jeff@garzik.org> 1171055529 -0500

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