Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Wed, 6 Jul 2011 01:22:39 +0000 (18:22 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Jul 2011 01:22:39 +0000 (18:22 -0700)

Trivial merge