tree b2c684c8ccd8aec71470cbf423e686693e8bbffd
parent 4b2281c7aa6a6e2615b35f8cebd93656dc6d714c
parent ec759a2b383b50950be37fbe470c4cc2ca18e2ce
author Jeff Garzik <jeff@garzik.org> 1176306945 -0400
committer Jeff Garzik <jeff@garzik.org> 1176306945 -0400

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