tree 2cf5fb9935412e1a0fae2b25718aa84fc2e8412d
parent a81c52a81d6dbe6a36bce18112da04f20b175192
parent df6d7c94b0c3ae6a1185c9e5fa8ee3368e4a5efb
author Jeff Garzik <jeff@garzik.org> 1162799889 -0500
committer Jeff Garzik <jeff@garzik.org> 1162799889 -0500

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