tree 5ece41dc3bd597f93d22ff499952b161060c371d
parent cea00da3972806d213a7dbe1b98e889435385e6b
parent eaf8f53bc001d20aa59aa4519b71f11a1cc7f945
author Jeff Garzik <jgarzik@pobox.com> 1132340264 -0500
committer Jeff Garzik <jgarzik@pobox.com> 1132340264 -0500

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