Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
David S. Miller [Thu, 10 Sep 2009 00:33:45 +0000 (17:33 -0700)]

Trivial merge