projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dd53df2 12e9447)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 7 Oct 2010 02:39:31 +0000 (19:39 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 7 Oct 2010 02:39:31 +0000 (19:39 -0700)
commit69259abb64d4da77273bf59accfc9fa79e7165f4
treebd043ab03a788b749c8d5ae4049d8defae9abf34tree | snapshot (tar.gz zip)
parentdd53df265b1ee7a1fbbc76bb62c3bec2383bbd44commit | diff
parent12e94471b2be5ef9b55b10004a3a2cd819490036commit | diff
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/pcmcia/pcnet_cs.c
net/caif/caif_socket.c
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/bonding/bond_main.c diff1 | diff2 | blob | history
drivers/net/ll_temac_main.c diff1 | diff2 | blob | history
drivers/net/pcmcia/pcnet_cs.c diff1 | diff2 | blob | history
drivers/net/skge.c diff1 | diff2 | blob | history
include/linux/pci_ids.h diff1 | diff2 | blob | history
net/9p/client.c diff1 | diff2 | blob | history
net/caif/caif_socket.c diff1 | diff2 | blob | history
net/sunrpc/auth_gss/auth_gss.c diff1 | diff2 | blob | history