Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 15 Nov 2010 18:59:49 +0000 (10:59 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 15 Nov 2010 18:59:49 +0000 (10:59 -0800)
commit6c1b6c6b873d66d353ef47a054156dfde3f4c075
treee07e4286cab3df4738951fae2e9f82e8a4578d43
parentfe8222406c8277a21172479d3a8283d31c209028
parent7e87fe84303cc54ecf3c7b688cb08ca24322a41d
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6