Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Wed, 25 May 2011 17:28:55 +0000 (13:28 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 25 May 2011 17:28:55 +0000 (13:28 -0400)

Trivial merge