Merge branch 'upstream-jgarzik' of git://git.tuxdriver.com/git/wireless-2.6