Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 21 Sep 2010 23:00:40 +0000 (16:00 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 21 Sep 2010 23:00:40 +0000 (16:00 -0700)
commit98e684bd5c927cb94ff23fb6f1dd34dd346a19cf
tree4274d2b1d7c5314e1bb4d33197211aa8faa08687
parente254c274ae19888e5693ba6d32576ab03a8ae8a4
parent536bb20b45dee3f9b77b0d250f8ed0733a5cb025
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6