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
..
alchemy	MIPS: MTX-1: Add udelay to mtx1_pci_idsel	2012-08-17 10:57:27 +02:00
ar7
ath79	MIPS: ath79: Use correct IRQ number for the OHCI controller on AR7240	2012-08-17 10:57:27 +02:00
bcm47xx
bcm63xx	MIPS: BCM63xx: Fix SPI message control register handling for BCM6338/6348.	2012-08-17 10:57:28 +02:00
boot
cavium-octeon	MIPS: Octeon: Fix broken interrupt controller code.	2012-08-17 10:57:26 +02:00
cobalt
configs	netfilter: remove xt_NOTRACK	2012-09-03 13:36:40 +02:00
dec
emma
fw
include/asm	MIPS: ath79: don't hardcode the unavailability of the DSP ASE	2012-08-17 10:57:29 +02:00
jazz
jz4740
kernel	MIPS: Synchronize MIPS count one CPU at a time	2012-08-17 10:57:28 +02:00
lantiq	MIPS: Lantiq: Platform specific CLK fixup	2012-08-01 17:58:09 +02:00
lasat
lib
loongson	MIPS: Loongson 2: Sort out clock managment.	2012-08-01 18:10:06 +02:00
loongson1	MIPS: Loongson 1: more clk support and add select HAVE_CLK	2012-08-01 17:59:23 +02:00
math-emu
mipssim
mm
mti-malta	MIPS: Malta: Delete duplicate PCI fixup.	2012-08-17 10:57:29 +02:00
netlogic
oprofile
pci	MIPS: pci-ar724x: avoid data bus error due to a missing PCIe module	2012-08-23 15:44:47 +02:00
pmc-sierra
pnx833x
pnx8550
power
powertv
rb532
sgi-ip22
sgi-ip27
sgi-ip32
sibyte
sni
txx9	MIPS: txx9: Fix redefinition of clk_* by adding select HAVE_CLK	2012-08-01 17:59:15 +02:00
vr41xx
wrppmc
Kbuild
Kbuild.platforms
Kconfig	MIPS: ath79: select HAVE_CLK	2012-08-17 10:57:27 +02:00
Kconfig.debug
Makefile