David S. Miller b48b63a1f6 Merge git://git.kernel.org/pub/scm/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>
2012-09-15 11:43:53 -04:00
..
2012-05-26 11:51:03 +10:00
2011-09-21 13:39:59 -07:00
2011-03-11 14:25:50 +00:00
2011-10-29 21:20:22 +02:00
2011-03-31 11:26:23 -03:00
2012-03-23 16:58:38 -07:00
2012-05-07 16:51:19 -07:00
2012-03-28 15:58:21 -07:00
2012-07-30 17:25:16 -07:00
2012-01-31 23:19:47 +02:00
2011-12-08 19:52:43 -05:00