Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
David S. Miller [Mon, 15 Mar 2010 23:23:54 +0000 (16:23 -0700)]
1  2 
Documentation/networking/timestamping/timestamping.c
drivers/net/davinci_emac.c

Simple merge