Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 12 Oct 2010 18:43:42 +0000 (11:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 12 Oct 2010 18:43:42 +0000 (11:43 -0700)
commit8fa6e3d4549271a5b4094893f059bb95f99a8fde
tree4c8ae1be73e4749f782cc3f18ec6e42650b8f872
parentc239f279e571a272c1b32a1e84b8fa037b68f49c
parent2f34b32977ade4249601f35f7eb0cdd56b4e0f89
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6