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: 2ea3dea 3f7970a)

author	David S. Miller <davem@davemloft.net>
	Fri, 16 Dec 2011 07:11:14 +0000 (02:11 -0500)
committer	David S. Miller <davem@davemloft.net>
	Fri, 16 Dec 2011 07:11:14 +0000 (02:11 -0500)
commit	36f95ec00a3167c1ec3207d00b14014e5a101de5
tree	27d3b3eaf3fe10d05319ad3395b2569ad5f8f6d0	tree \| snapshot
parent	2ea3dea78c82a5ee34bf86d5363d5750194c4246	commit \| diff
parent	3f7970a52822611e78110b41847b7c635e1c6b50	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/freescale/fsl_pq_mdio.c
net/batman-adv/translation-table.c
net/ipv6/route.c

drivers/net/ethernet/freescale/fec.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fsl_pq_mdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ppp/pptp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/translation-table.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipip.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/sit.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/agg-tx.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_gred.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.