David S. Miller d4185bbf62 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

Minor conflict between the BCM_CNIC define removal in net-next
and a bug fix added to net.  Based upon a conflict resolution
patch posted by Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>

2012-11-10 18:32:51 -05:00

..

alchemy

MIPS: Alchemy: Merge PB1100/1500 support into DB1000 code.

2012-10-11 11:11:20 +02:00

ar7

arch: Use eth_random_addr

2012-07-16 22:39:25 -07:00

ath79

MIPS: ath79: Fix CPU/DDR frequency calculation for SRIF PLLs

2012-10-01 11:37:15 +02:00

bcm47xx

MIPS: BCM47xx: Fix BCMA_DRIVER_PCI_HOSTMODE config dependencies

2012-07-19 11:23:43 +02:00

bcm63xx

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2012-10-09 16:08:04 +09:00

boot

MIPS: Alchemy: Single kernel for DB1200/1300/1550

2012-10-11 11:11:20 +02:00

cavium-octeon

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2012-10-09 16:08:04 +09:00

cobalt

MIPS: Mark cascade and low level interrupts IRQF_NO_THREAD

2011-09-21 17:52:15 +02:00

configs

MIPS: Alchemy: Merge PB1100/1500 support into DB1000 code.

2012-10-11 11:11:20 +02:00

dec

MIPS: DEC: use IS_ENABLED()

2012-07-23 13:55:54 +01:00

emma

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

fw

MIPS: Remove all -Wall and almost all -Werror usage from arch/mips.

2012-05-21 15:09:36 +01:00

include

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-11-10 18:32:51 -05:00

jazz

Merge branch 'next/generic' into mips-for-linux-next

2012-01-11 15:41:47 +01:00

jz4740

MIPS: JZ4740: Forward declare struct uart_port in header.

2012-10-17 17:00:50 +02:00

kernel

MIPS: CMP: Fix physical core number calculation logic

2012-10-18 11:45:41 +02:00

lantiq

Merge branch 'master' of git://dev.phrozen.org/mips-next into mips-for-linux-next

2012-10-05 15:56:28 +02:00

lasat

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

lib

MIPS: Restore pagemask after dumping the TLB.

2012-10-17 01:01:20 +02:00

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

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

mm

MIPS: hugetlbfs: Fix hazard between tlb write and pagemask restoration.

2012-10-17 01:01:21 +02:00

mti-malta

Merge branch 'ralf-3.7' of git://git.linux-mips.org/pub/scm/sjhill/linux-sjhill into mips-for-linux-next

2012-09-28 16:29:55 +02:00

mti-sead3

MIPS: Add core files for MIPS SEAD-3 development platform.

2012-09-13 15:43:46 -05:00

netlogic

MIPS: Netlogic: Add support for built in DTB

2012-08-22 23:46:37 +02:00

oprofile

Merge branches 'next/generic', 'next/alchemy', 'next/bcm63xx', 'next/cavium', 'next/jz4740', 'next/lantiq', 'next/loongson1b' and 'next/netlogic' into mips-for-linux-next

2012-07-25 16:37:46 +02:00

pci

MIPS: Malta: Fix section mismatch.

2012-10-11 11:14:12 +02:00

pmc-sierra

PCI changes for the 3.6 merge window:

2012-07-24 16:17:07 -07:00

pnx833x

MIPS: PNX833x: use IS_ENABLED() macro

2012-07-23 13:55:53 +01:00

pnx8550

MIPS: irq: Remove IRQF_DISABLED

2011-12-07 22:03:45 +00:00

power

MIPS: Hibernation: Fixes for PAGE_SIZE >= 64kb

2011-05-10 18:15:26 +01:00

powertv

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2012-07-24 10:01:50 -07:00

rb532

- More robust parsing especially of xattr data in JFFS2

2012-06-01 16:55:42 -07:00

sgi-ip22

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

sgi-ip27

mips: zero out pg_data_t when it's allocated

2012-07-31 18:42:49 -07:00

sgi-ip32

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

sibyte

documentation: remove references to cpu_*_map.

2012-03-29 15:38:31 +10:30

sni

MIPS: SNI: Switch RM400 serial to SCCNXP driver

2012-10-11 11:14:13 +02:00

txx9

MIPS: txx9: Fix redefinition of clk_* by adding select HAVE_CLK

2012-08-01 17:59:15 +02:00

vr41xx

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

wrppmc

MIPS: WRPPMC: Migrate to new platform makefile style.

2010-08-05 13:25:51 +01:00

Kbuild

MIPS: Repair Kbuild make clean breakage.

2010-10-19 18:32:39 +01:00

Kbuild.platforms

Merge branch 'ralf-3.7' of git://git.linux-mips.org/pub/scm/sjhill/linux-sjhill into mips-for-linux-next

2012-09-28 16:29:55 +02:00

Kconfig

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2012-10-14 14:39:05 -07:00

Kconfig.debug

Fix typo in various Kconfig file

2012-04-16 14:40:08 +02:00

Makefile

kbuild: Fix gcc -x syntax

2012-10-03 09:03:24 +02:00