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
..
2011-07-26 16:49:45 -07:00
2012-07-14 16:35:02 +04:00
2012-05-21 23:52:30 -04:00
2012-05-31 17:49:27 -07:00
2011-07-14 12:59:14 +03:00
2012-03-28 18:30:03 +01:00
2012-05-31 17:49:32 -07:00
2012-05-29 23:28:41 -04:00
2012-03-29 19:52:46 +08:00
2012-08-14 21:49:35 -07:00
2012-06-13 21:16:42 +02:00
2012-03-28 18:30:03 +01:00
2012-06-11 15:07:52 +02:00
2012-05-31 17:49:32 -07:00
2012-07-30 17:25:13 -07:00
2012-03-15 18:17:55 -07:00
2012-05-19 15:44:40 -06:00