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
..
alpha	alpha: Fix fall-out from disintegrating asm/system.h	2012-08-19 08:41:19 -07:00
arm	Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping	2012-09-14 17:53:11 -07:00
avr32
blackfin	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin	2012-09-12 07:12:53 +08:00
c6x	Enable atomic64 ops in C6X	2012-08-17 08:10:12 -07:00
cris
frv
h8300
hexagon
ia64	[IA64] defconfig: Remove CONFIG_MISC_DEVICES	2012-08-20 13:04:29 -07:00
m32r
m68k	netfilter: remove xt_NOTRACK	2012-09-03 13:36:40 +02:00
microblaze
mips	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-15 11:43:53 -04:00
mn10300
openrisc
parisc
powerpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-15 11:43:53 -04:00
s390	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-09-14 17:43:45 -07:00
score
sh	Merge branches 'sh/urgent' and 'sh/gpiolib' into sh-latest	2012-08-09 13:21:13 +09:00
sparc	sparc64: Be less verbose during vmemmap population.	2012-08-15 00:37:29 -07:00
tile	netfilter: remove xt_NOTRACK	2012-09-03 13:36:40 +02:00
um	uml: fix compile error in deliver_alarm()	2012-09-05 19:40:59 -07:00
unicore32
x86	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-15 11:43:53 -04:00
xtensa
.gitignore
Kconfig