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: a5f0f5c 5c90fb7)

author	David S. Miller <davem@davemloft.net>
	Mon, 9 Nov 2009 07:00:54 +0000 (23:00 -0800)
committer	David S. Miller <davem@davemloft.net>
	Mon, 9 Nov 2009 07:00:54 +0000 (23:00 -0800)
commit	040efa95e72c5f5dc854a465049647f52cea6c85
tree	daab7cc0db83226672f76d2fc9277e4355f89e6b	tree \| snapshot
parent	a5f0f5c3de5515ef9a5a47aafebf618559ba9952	commit \| diff
parent	5c90fb70f74bb3b12713be88bc03daa0ab09abc2	commit \| diff

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/can/usb/ems_usb.c

12 files changed:

drivers/net/benet/be.h	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/dev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/usb/ems_usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fsl_pq_mdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlge/qlge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlge/qlge_mpi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/ipw2200.c	diff1 \|	diff2 \|	blob \| history
net/can/bcm.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipip.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.