Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
David S. Miller [Fri, 4 Nov 2011 21:14:34 +0000 (17:14 -0400)]

Trivial merge