projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a2f3be1 d050700)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <[email protected]>
Mon, 3 May 2010 22:45:52 +0000 (15:45 -0700)
committerDavid S. Miller <[email protected]>
Mon, 3 May 2010 22:45:52 +0000 (15:45 -0700)
1  2 
drivers/net/ppp_generic.c patch | diff1 | diff2 | blob | history
drivers/net/usb/dm9601.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/ppp_generic.c
Simple merge
diff --cc drivers/net/usb/dm9601.c
Simple merge
John Crispins staging tree