Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6.