projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 071d7ab 6984937)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 8 Oct 2008 21:56:41 +0000 (14:56 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 8 Oct 2008 21:56:41 +0000 (14:56 -0700)
commit4dd565134ece7e5d528d4c5288879310c54419e9
treee08910d2d0feae0c030f8f01acc9b03eb760ad9atree | snapshot (tar.gz zip)
parent071d7ab6649eb34a873a53e71635186e9117101dcommit | diff
parent69849375d6b13e94d08cdc94b49b11fbab454a0ecommit | diff
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:

drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/netdev.c
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/e1000e/e1000.h diff1 | diff2 | blob | history
drivers/net/e1000e/ethtool.c diff1 | diff2 | blob | history
drivers/net/e1000e/ich8lan.c diff1 | diff2 | blob | history
drivers/net/e1000e/netdev.c diff1 | diff2 | blob | history
drivers/net/e1000e/param.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/core/rtnetlink.c diff1 | diff2 | blob | history
net/ipv4/tcp_input.c diff1 | diff2 | blob | history