Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
David S. Miller [Fri, 11 Dec 2009 22:19:31 +0000 (14:19 -0800)]

Trivial merge