projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e13f86 c39d35e)
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc...
authorDavid S. Miller <davem@davemloft.net>
Fri, 10 Dec 2010 18:20:43 +0000 (10:20 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 10 Dec 2010 18:20:43 +0000 (10:20 -0800)
1  2 
drivers/net/sfc/net_driver.h patch | diff1 | diff2 | blob | history
drivers/net/sfc/nic.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/sfc/net_driver.h
Simple merge
diff --cc drivers/net/sfc/nic.c
Simple merge