From: David S. Miller <davem@davemloft.net>
Date: Wed, 4 Mar 2015 02:16:48 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: omap-for-v4.1/fixes-rc1~141^2~353
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71a83a6db6138b9d41d8a0b6b91cb59f6dc4742c;p=pandora-kernel.git

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

Conflicts:
	drivers/net/ethernet/rocker/rocker.c

The rocker commit was two overlapping changes, one to rename
the ->vport member to ->pport, and another making the bitmask
expression use '1ULL' instead of plain '1'.

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

71a83a6db6138b9d41d8a0b6b91cb59f6dc4742c
Reading git-diff-tree failed