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

Trivial merge