]> err.no Git - linux-2.6/commitdiff
Merge git://tipc.cslab.ericsson.net/pub/git/tipc
authorDavid S. Miller <davem@sunset.davemloft.net>
Wed, 18 Jan 2006 22:23:54 +0000 (14:23 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 18 Jan 2006 22:23:54 +0000 (14:23 -0800)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge