tree 3a64ad0825e82c3df0b4d84c412c647c19e34afb
parent 4c1234ff24dd8dc2d9020d6315d91a71339be114
parent 89c318ed3985da1271e00ad586f2dce8a6e75656
author Jeff Garzik <jeff@garzik.org> 1150793162 -0400
committer Jeff Garzik <jeff@garzik.org> 1150793162 -0400

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