projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3248e16 1f5865e)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 3 Dec 2009 06:00:34 +0000 (22:00 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 Dec 2009 06:00:34 +0000 (22:00 -0800)
1  2 
Documentation/networking/ip-sysctl.txt patch | diff1 | diff2 | blob | history
drivers/net/atl1e/atl1e_main.c patch | diff1 | diff2 | blob | history
drivers/net/bnx2.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/atl1e/atl1e_main.c
Simple merge
diff --cc drivers/net/bnx2.c
Simple merge