Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 3 May 2010 22:45:52 +0000 (15:45 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 3 May 2010 22:45:52 +0000 (15:45 -0700)
commit0f7ca5917e989c4f77db3e97f92badaf3266d4dc
tree0f29c4d45870c7d6317ff768c751aebf0948098a
parenta2f3be17c07ad9bd45ab300f79642ecb39cfb553
parentd05070091849015f8c5b7d55cd75b86ebb61b3ec
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
drivers/net/ppp_generic.c
drivers/net/usb/dm9601.c