Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Thu, 6 Jan 2011 18:55:42 +0000 (10:55 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 6 Jan 2011 18:55:42 +0000 (10:55 -0800)

Trivial merge