Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 16 Dec 2011 07:11:14 +0000 (02:11 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 16 Dec 2011 07:11:14 +0000 (02:11 -0500)
commitb26e478f8fd5b575684f021b05a5c6236ebb911a
tree27d3b3eaf3fe10d05319ad3395b2569ad5f8f6d0
parentbcebcc468a6bcd3820fe9ad36b34220563efc93a
parentbb3c36863e8001fc21a88bebfdead4da4c23e848
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
drivers/net/ethernet/freescale/fsl_pq_mdio.c
drivers/net/ppp/pptp.c
drivers/net/wireless/ath/ath9k/main.c
net/batman-adv/translation-table.c
net/ipv4/ipip.c
net/ipv6/addrconf.c
net/ipv6/route.c
net/ipv6/sit.c
net/mac80211/agg-tx.c
net/sched/sch_gred.c