Merge branch 'tipc-Dec29-2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg...
authorDavid S. Miller <davem@davemloft.net>
Fri, 30 Dec 2011 18:46:54 +0000 (13:46 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 30 Dec 2011 18:46:54 +0000 (13:46 -0500)

Trivial merge