Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Thu, 23 Dec 2010 18:13:30 +0000 (10:13 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 23 Dec 2010 18:13:30 +0000 (10:13 -0800)

Trivial merge