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
..
boot
configs	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-15 11:43:53 -04:00
include/asm	powerpc/powernv: Always go into nap mode when CPU is offline	2012-09-05 16:05:20 +10:00
kernel	powerpc: Make sure IPI handlers see data written by IPI senders	2012-09-05 16:05:22 +10:00
kvm
lib	powerpc: Don't use __put_user() in patch_instruction	2012-09-05 16:05:23 +10:00
math-emu
mm	powerpc/vphn: Fix arch_update_cpu_topology() return value	2012-09-05 16:05:19 +10:00
net
oprofile
perf
platforms	powerpc/powernv: Always go into nap mode when CPU is offline	2012-09-05 16:05:20 +10:00
sysdev	powerpc: Make sure IPI handlers see data written by IPI senders	2012-09-05 16:05:22 +10:00
xmon
Kconfig
Kconfig.debug
Makefile
relocs_check.pl