Merge branch 'tipc-May10-2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg...
authorDavid S. Miller <davem@davemloft.net>
Wed, 11 May 2011 16:41:28 +0000 (12:41 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 May 2011 16:41:28 +0000 (12:41 -0400)

Trivial merge