Merge branch 'upstream-fixes' of git://git.tuxdriver.com/git/netdev-jwl