tree f68ca04180c5488301a40ec212ef2eb2467cf56c
parent 4638aef40ba9ebb9734caeed1f373c24015259fd
parent 8678887e7fb43cd6c9be6c9807b05e77848e0920
author Jeff Garzik <jgarzik@pretzel.yyz.us> 1119820263 -0400
committer Jeff Garzik <jgarzik@pobox.com> 1119820263 -0400

Merge upstream (approx. 2.6.12-git8) into 'janitor' branch of netdev-2.6.