Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
commita2d4b65d477aad1fe8c7218781a031fa9cf5abfc
authorDavid S. Miller <davem@davemloft.net>
Wed, 8 Dec 2010 18:01:00 +0000 (8 10:01 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 8 Dec 2010 18:01:00 +0000 (8 10:01 -0800)
tree940fa997e1a2897999bf92361e80162d6bdbbaad
parent01b0c5cfb23f19837650aa53495ace6d0fd7d3f8
parent04910265078f08a73208beab70ed2a3cce4a919f
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6