Merge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/git...
Linus Torvalds [Fri, 2 Sep 2005 09:01:35 +0000 (02:01 -0700)]

Trivial merge