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: bd50121 0163798)

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	295cb714c8ab584bb7713e4de5797480035e70fa
tree	d2a971a7dc9f3a1af8035e38419c4c4ad8c22632	tree \| snapshot
parent	bd501214325878f0ca9019825ecb7140fd3adf0d	commit \| diff
parent	0163798132445d5aa00fa4df9e6213ac1bb07ab1	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.