Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

author David S. Miller <davem@davemloft.net>

Mon, 10 Aug 2009 04:29:47 +0000 (21:29 -0700)

committer David S. Miller <davem@davemloft.net>

Mon, 10 Aug 2009 04:29:47 +0000 (21:29 -0700)
author David S. Miller <davem@davemloft.net>
Mon, 10 Aug 2009 04:29:47 +0000 (21:29 -0700)
committer David S. Miller <davem@davemloft.net>
Mon, 10 Aug 2009 04:29:47 +0000 (21:29 -0700)
diff --cc net/appletalk/ddp.c
Simple merge
diff --cc net/dccp/proto.c
Simple merge
diff --cc net/irda/af_irda.c
Simple merge
author	David S. Miller <davem@davemloft.net>
	Mon, 10 Aug 2009 04:29:47 +0000 (21:29 -0700)
committer	David S. Miller <davem@davemloft.net>
	Mon, 10 Aug 2009 04:29:47 +0000 (21:29 -0700)
		1	2
net/appletalk/ddp.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/dccp/proto.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/irda/af_irda.c	patch \|	diff1 \|	diff2 \|	blob \| history