git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a028c3d a1a94f2)

author	David S. Miller <davem@davemloft.net>
	Thu, 7 Oct 2010 02:39:31 +0000 (19:39 -0700)
committer	David S. Miller <davem@davemloft.net>
	Thu, 7 Oct 2010 02:39:31 +0000 (19:39 -0700)
commit	cecb10ac77c47deb217b8bf8af6d748325a16a20
tree	bd043ab03a788b749c8d5ae4049d8defae9abf34	tree \| snapshot
parent	a028c3d89416389f54e77dd1a0466a8cba484976	commit \| diff
parent	a1a94f278151b6cf811ebb1e5342273a0821b67f	commit \| diff

Merge branch 'master' of master.kernel.org:/pub/scm/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

Linux Kernel Source Tree.