Merge branch 'tipc-Jun24-2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg...
authorDavid S. Miller <davem@davemloft.net>
Fri, 24 Jun 2011 23:49:10 +0000 (16:49 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 Jun 2011 23:49:10 +0000 (16:49 -0700)

Trivial merge