Merge branch 'tipc-Feb23-2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg...
authorDavid S. Miller <davem@davemloft.net>
Thu, 24 Feb 2011 04:47:56 +0000 (20:47 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 24 Feb 2011 04:47:56 +0000 (20:47 -0800)

Trivial merge