From: David S. Miller <davem@davemloft.net>
Date: Sun, 21 Aug 2011 00:25:36 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net... 
X-Git-Tag: v3.2-rc1~129^2~425
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca1ba7caa68520864e4b9227e67f3bbc6fed373b;p=pandora-kernel.git

Merge branch 'master' of /linux/kernel/git/jkirsher/net-next

Conflicts:
	drivers/net/ethernet/intel/e1000e/netdev.c
---

ca1ba7caa68520864e4b9227e67f3bbc6fed373b
Reading git-diff-tree failed