From: David S. Miller <davem@davemloft.net>
Date: Tue, 15 Jan 2013 20:05:59 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.9-rc1~139^2~377
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b87f922598acf91eee18f71688a33f54f57bcde;p=pandora-kernel.git

Merge git://git./linux/kernel/git/davem/net

Conflicts:
	Documentation/networking/ip-sysctl.txt
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

Both conflicts were simply overlapping context.

A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

4b87f922598acf91eee18f71688a33f54f57bcde
Reading git-diff-tree failed