Merge upstream into 'upstream' branch of netdev-2.6.git.