From: David S. Miller <davem@davemloft.net>
Date: Sun, 25 Nov 2012 17:49:17 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.8-rc1~139^2~231
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=24bc518a6888e4c97add5a5ebbff11c1ccac219f;p=platform%2Fkernel%2Flinux-stable.git

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

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/tx.c

Minor iwlwifi conflict in TX queue disabling between 'net', which
removed a bogus warning, and 'net-next' which added some status
register poking code.

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

24bc518a6888e4c97add5a5ebbff11c1ccac219f