From: David S. Miller <davem@davemloft.net>
Date: Sun, 7 Apr 2013 22:37:01 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~65^2~205
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d978a6361ad13f1f9694fcb7b5852d253a544d92;p=pandora-kernel.git

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

Conflicts:
	drivers/nfc/microread/mei.c
	net/netfilter/nfnetlink_queue_core.c

Pull in 'net' to get Eric Biederman's AF_UNIX fix, upon which
some cleanups are going to go on-top.

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

d978a6361ad13f1f9694fcb7b5852d253a544d92
Reading git-diff-tree failed