Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Tue, 17 May 2011 02:49:41 +0000 (22:49 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 May 2011 02:49:41 +0000 (22:49 -0400)

Trivial merge