Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
David S. Miller [Fri, 19 Sep 2008 23:17:12 +0000 (16:17 -0700)]

Trivial merge