From: David S. Miller <davem@davemloft.net>
Date: Sun, 15 Apr 2012 17:19:04 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.5-rc1~109^2~431
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56845d78cee8576a8160cee8aeac62efdb561ae2;p=pandora-kernel.git

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

Conflicts:
	drivers/net/ethernet/atheros/atlx/atl1.c
	drivers/net/ethernet/atheros/atlx/atl1.h

Resolved a conflict between a DMA error bug fix and NAPI
support changes in the atl1 driver.

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

56845d78cee8576a8160cee8aeac62efdb561ae2
Reading git-diff-tree failed