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

Trivial merge