Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Fri, 28 Jan 2011 00:00:37 +0000 (16:00 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 28 Jan 2011 00:00:37 +0000 (16:00 -0800)

Trivial merge