Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville...
David S. Miller [Mon, 28 Sep 2009 21:50:06 +0000 (14:50 -0700)]

Trivial merge