From: David S. Miller <davem@davemloft.net>
Date: Tue, 9 Sep 2008 00:28:59 +0000 (-0700)
Subject: Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/dccp_exp
X-Git-Tag: v2.6.28-rc1~717^2~305
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0a68a20cc3eafa73bb54097c28b921147d7d3685;p=linux-2.6-omap-h63xx.git

Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/dccp_exp

Conflicts:

	net/dccp/input.c
	net/dccp/options.c
---

0a68a20cc3eafa73bb54097c28b921147d7d3685