Merge branch 'tipc-Sep17-2011' of git://openlinux.windriver.com/people/paulg/net...
authorDavid S. Miller <davem@davemloft.net>
Tue, 20 Sep 2011 18:39:04 +0000 (14:39 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 20 Sep 2011 18:39:04 +0000 (14:39 -0400)

Trivial merge