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	powerpc/p4080ds: dts - add usb controller version info and port0	2012-08-10 07:47:02 -05:00
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	ppc: e500_tlb memset clears nothing	2012-08-16 14:14:53 +02:00
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	powerpc: Start using ___PPC_RA/B/S/T where necessary	2012-07-10 19:18:25 +10:00
oprofile	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
perf	powerpc/perf: Use pmc_overflow() to detect rolled back events	2012-08-24 20:26:10 +10:00
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	powerpc: Fixup whitespace in xmon	2012-08-24 20:26:03 +10:00
Kconfig	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	2012-07-30 17:25:21 -07:00
Kconfig.debug	powerpc: IOMMU fault injection	2012-07-10 19:18:59 +10:00
Makefile	crypto: nx - move nx build to driver/crypto Makefile	2012-06-27 14:42:00 +08:00
relocs_check.pl