From: David S. Miller <davem@davemloft.net>
Date: Wed, 27 Mar 2013 17:52:49 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: MMI-PSA29.97-13-9~14469^2~301
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e2a553dbf18a5177fdebe29495c32a8e7fd3a4db;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

Conflicts:
	include/net/ipip.h

The changes made to ipip.h in 'net' were already included
in 'net-next' before that header was moved to another location.

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

e2a553dbf18a5177fdebe29495c32a8e7fd3a4db