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

author David S. Miller <[email protected]>

Mon, 15 Mar 2010 23:23:54 +0000 (16:23 -0700)

committer David S. Miller <[email protected]>

Mon, 15 Mar 2010 23:23:54 +0000 (16:23 -0700)
author David S. Miller <[email protected]>
Mon, 15 Mar 2010 23:23:54 +0000 (16:23 -0700)
committer David S. Miller <[email protected]>
Mon, 15 Mar 2010 23:23:54 +0000 (16:23 -0700)
diff --cc Documentation/networking/timestamping/timestamping.c
Simple merge
diff --cc drivers/net/davinci_emac.c
Simple merge
author	David S. Miller <[email protected]>
	Mon, 15 Mar 2010 23:23:54 +0000 (16:23 -0700)
committer	David S. Miller <[email protected]>
	Mon, 15 Mar 2010 23:23:54 +0000 (16:23 -0700)
		1	2
Documentation/networking/timestamping/timestamping.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/davinci_emac.c	patch \|	diff1 \|	diff2 \|	blob \| history