Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Mon, 3 May 2010 22:45:52 +0000 (15:45 -0700)]
1  2 
drivers/net/ppp_generic.c
drivers/net/usb/dm9601.c

Simple merge
Simple merge