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