Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
David S. Miller [Wed, 12 Nov 2008 22:37:29 +0000 (14:37 -0800)]

Trivial merge