From: David S. Miller <davem@davemloft.net>
Date: Sat, 15 Sep 2012 15:43:53 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~47^2~165
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b48b63a1f6e26b0dec2c9f1690396ed4bcb66903;p=pandora-kernel.git

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

Conflicts:
	net/netfilter/nfnetlink_log.c
	net/netfilter/xt_LOG.c

Rather easy conflict resolution, the 'net' tree had bug fixes to make
sure we checked if a socket is a time-wait one or not and elide the
logging code if so.

Whereas on the 'net-next' side we are calculating the UID and GID from
the creds using different interfaces due to the user namespace changes
from Eric Biederman.

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

b48b63a1f6e26b0dec2c9f1690396ed4bcb66903
Reading git-diff-tree failed