From: David S. Miller <davem@davemloft.net>
Date: Thu, 19 Jul 2012 18:17:30 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.6-rc1~125^2~60
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abaa72d7fd9a20a67b62e6afa0e746e27851dc33;p=pandora-kernel.git

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

Conflicts:
	drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
---

abaa72d7fd9a20a67b62e6afa0e746e27851dc33
Reading git-diff-tree failed