Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Thu, 15 Apr 2010 21:31:06 +0000 (14:31 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 15 Apr 2010 21:31:06 +0000 (14:31 -0700)

Trivial merge