Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
David S. Miller [Fri, 1 Jul 2011 08:52:02 +0000 (01:52 -0700)]

Trivial merge