Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Wed, 20 Oct 2010 08:59:48 +0000 (01:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 20 Oct 2010 08:59:48 +0000 (01:59 -0700)

Trivial merge