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)
commit1897fe55e1385ddfb7733d0e0819588571cca867
tree672c324c49e0252da94d15ddd68d78d2df4da903
parentcd5f3e2064ea21e1cbe140728a1b04e7d32f68eb
parente4a0aee47e1823025972b8f3defde432e485b7b9
Merge branch 'tipc-Jun24-2011' of git://git./linux/kernel/git/paulg/net-next-2.6