Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
David S. Miller [Wed, 3 Aug 2011 23:36:41 +0000 (16:36 -0700)]

Trivial merge