Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Tue, 14 Dec 2010 18:52:54 +0000 (10:52 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Dec 2010 18:52:54 +0000 (10:52 -0800)

Trivial merge