Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Mon, 29 Aug 2011 20:46:24 +0000 (13:46 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 29 Aug 2011 20:46:24 +0000 (13:46 -0700)

Trivial merge