Public Git Hosting - linux-2.6.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: bcebcc4 bb3c368)

commit	b26e478f8fd5b575684f021b05a5c6236ebb911a
author	David S. Miller <davem@davemloft.net>
	Fri, 16 Dec 2011 07:11:14 +0000 (16 02:11 -0500)
committer	David S. Miller <davem@davemloft.net>
	Fri, 16 Dec 2011 07:11:14 +0000 (16 02:11 -0500)
tree	27d3b3eaf3fe10d05319ad3395b2569ad5f8f6d0	tree \| snapshot (tar.gz zip)
parent	bcebcc468a6bcd3820fe9ad36b34220563efc93a	commit \| diff
parent	bb3c36863e8001fc21a88bebfdead4da4c23e848	commit \| diff

Merge git://git./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

Linus' kernel tree