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)
commit56be178875cf699a17cc285171492353620ef0ae
tree26b8f0473d5c8f6fcbc50d76bb30aae0dd176bd5
parent7f8e3234c5f7fbdb06be050c8a1907e9c36d7c61
parentf19765f4f7dc3cb118cf5f151ed56e01063082ed
Merge branch 'tipc-Dec29-2011' of git://git./linux/kernel/git/paulg/linux