tree 8e5f315226b618cb8e050a0c7653c8ec134501e3
parent 17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b
parent a3cbdde8e9c38b66b4f13ac5d6ff1939ded0ff20
author David S. Miller <davem@davemloft.net> 1220920139 -0700
committer David S. Miller <davem@davemloft.net> 1220920139 -0700

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

Conflicts:

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