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: 2c0e2f9 4805017)

author	David S. Miller <davem@davemloft.net>
	Thu, 21 Jul 2011 20:38:42 +0000 (13:38 -0700)
committer	David S. Miller <davem@davemloft.net>
	Thu, 21 Jul 2011 20:38:42 +0000 (13:38 -0700)
commit	c439851c11520e27e676108f27a71a3dcd01f647
tree	d2a971a7dc9f3a1af8035e38419c4c4ad8c22632	tree \| snapshot
parent	2c0e2f90d2f525492363af4069720513502ce4e4	commit \| diff
parent	4805017381d7103a60293416d19859b4ee69a972	commit \| diff

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

Conflicts:
net/bluetooth/l2cap_core.c

drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/gianfar.c	diff1 \|	diff2 \|	blob \| history
drivers/net/gianfar.h	diff1 \|	diff2 \|	blob \| history
drivers/net/r6040.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan_dev.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap_core.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.