Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
David S. Miller [Wed, 3 Sep 2008 21:32:33 +0000 (14:32 -0700)]

Trivial merge