Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...
David S. Miller [Wed, 5 Mar 2008 00:44:01 +0000 (16:44 -0800)]

Trivial merge