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

Trivial merge