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

Conflicts:
	drivers/net/vmxnet3/vmxnet3_drv.c

Small vmxnet3 conflict with header size bug fix in 'net'.

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

2012-03-05 21:16:26 -05:00

..

fixup-bcm63xx.c

MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs.

2009-09-17 20:07:52 +02:00

fixup-capcella.c

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

fixup-cobalt.c

MIPS: Cobalt: convert legacy port addresses to GT-64111 bus addresses

2010-02-27 12:53:44 +01:00

fixup-emma2rh.c

MIPS: Eleminate filenames from comments

2009-08-03 17:52:40 +01:00

fixup-fuloong2e.c

Fix typo configue => configure in comments

2010-09-23 11:46:50 +02:00

fixup-ip32.c

[MIPS] PCI: Make dev pointer argument of pcibios_map_irq const.

2007-07-10 17:33:00 +01:00

fixup-jmr3927.c

[MIPS] TXx9: Make single kernel can support multiple boards

2008-07-15 18:44:35 +01:00

fixup-lemote2f.c

MIPS: Loongson: Lemote-2F: USB: Not Emulate Non-Posted Writes

2010-02-27 12:53:09 +01:00

fixup-malta.c

[MIPS] PCI: Make dev pointer argument of pcibios_map_irq const.

2007-07-10 17:33:00 +01:00

fixup-mpc30x.c

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

fixup-pmcmsp.c

Author: Ralf Baechle <ralf@linux-mips.org>

2007-10-29 19:35:37 +00:00

fixup-pnx8550.c

[MIPS] PCI: Make dev pointer argument of pcibios_map_irq const.

2007-07-10 17:33:00 +01:00

fixup-rbtx4927.c

[MIPS] TXx9: Make single kernel can support multiple boards

2008-07-15 18:44:35 +01:00

fixup-rbtx4938.c

[MIPS] TXx9: Make single kernel can support multiple boards

2008-07-15 18:44:35 +01:00

fixup-rc32434.c

MIPS: RB532: Fix build error

2008-10-27 16:18:26 +00:00

fixup-sb1250.c

MIPS: Eleminate filenames from comments

2009-08-03 17:52:40 +01:00

fixup-sni.c

[MIPS] SNI PCIT CPLUS: workaround for b0rked irq wiring of onboard PCI bus 1

2007-11-15 23:21:50 +00:00

fixup-tb0219.c

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

fixup-tb0226.c

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

fixup-tb0287.c

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

fixup-wrppmc.c

[MIPS] PCI: Make dev pointer argument of pcibios_map_irq const.

2007-07-10 17:33:00 +01:00

fixup-yosemite.c

[MIPS] PCI: Make dev pointer argument of pcibios_map_irq const.

2007-07-10 17:33:00 +01:00

Makefile

Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next

2012-01-11 15:42:31 +01:00

msi-octeon.c

MIPS: Fix up inconsistency in panic() string argument.

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

ops-bcm63xx.c

MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs.

2009-09-17 20:07:52 +02:00

ops-bonito64.c

MIPS: Bonito64: Make Loongson independent from Bonito64 code.

2009-12-17 01:57:06 +00:00

ops-bridge.c

[MIPS] IP27: misc fixes

2008-06-05 18:13:15 +01:00

ops-emma2rh.c

MIPS: Eleminate filenames from comments

2009-08-03 17:52:40 +01:00

ops-gt64xxx_pci0.c

[MIPS] merge GT64111 PCI routines and GT64120 PCI_0 routines

2007-04-27 16:20:23 +01:00

ops-lantiq.c

MIPS: Lantiq: Add PCI controller support.

2011-05-19 09:55:42 +01:00

ops-loongson2.c

MIPS: Lemote 2F: Ensure atomic execution of _rdmsr and _wrmsr

2010-04-12 17:26:12 +01:00

ops-mace.c

[MIPS] Enable FAST-20 for onboard scsi

2008-07-15 18:44:31 +01:00

ops-msc.c

Fixes for system controllers for Atlas/Malta core cards.

2005-10-29 19:30:20 +01:00

ops-nile4.c

MIPS: NILE4: Remove useless inclusion of GT64120 header.

2011-07-20 23:12:09 +01:00

ops-pmcmsp.c

MIPS: irq: Remove IRQF_DISABLED

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

ops-pnx8550.c

MIPS: Kill unused <asm/debug.h> inclusions

2008-10-15 12:46:52 +01:00

ops-rc32434.c

[MIPS] Routerboard 532: Support for base system

2008-07-20 14:38:18 +01:00

ops-sni.c

[MIPS] Fix "no space between function name and open parenthesis" warnings.

2007-10-11 23:46:15 +01:00

ops-titan-ht.c

MIPS: PCI: RM9000 checkpatch cleanup

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

ops-titan.c

[MIPS] Support for the RM9000-based Basler eXcite smart camera platform.

2006-06-19 17:39:26 +01:00

ops-tx3927.c

MIPS: irq: Remove IRQF_DISABLED

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

ops-tx4927.c

MIPS: Add missing #inclusions of <linux/irq.h>

2010-10-07 14:08:54 +01:00

ops-vr41xx.c

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

pci-alchemy.c

MIPS: Fix Jazz 64-bit build error.

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

pci-ath724x.c

MIPS: Initial PCI support for Atheros 724x SoCs.

2011-12-07 22:02:47 +00:00

pci-bcm47xx.c

bcma: add PCIe host controller

2012-02-06 14:53:04 -05:00

pci-bcm63xx.c

MIPS: BCM63XX: Add support for bcm6368 CPU.

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

pci-bcm63xx.h

MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs.

2009-09-17 20:07:52 +02:00

pci-bcm1480.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

pci-bcm1480ht.c

MIPS: Remove useless zero initializations.

2009-09-17 20:07:51 +02:00

pci-emma2rh.c

MIPS: Eleminate filenames from comments

2009-08-03 17:52:40 +01:00

pci-ip27.c

mips: add export.h to files using EXPORT_SYMBOL/THIS_MODULE

2011-10-31 19:30:57 -04:00

pci-ip32.c

[MIPS] Fix IP32 breakage

2008-01-07 15:32:03 +00:00

pci-lantiq.c

MIPS: lantiq: use export.h in favour of module.h

2011-11-14 13:59:24 +00:00

pci-lantiq.h

MIPS: Lantiq: Add PCI controller support.

2011-05-19 09:55:42 +01:00

pci-lasat.c

[MIPS] Remove mips_machtype for LASAT machines

2008-07-15 18:44:39 +01:00

pci-octeon.c

MIPS: Octeon: Update PCI Latency timer and enable more error reporting.

2011-12-08 12:26:28 +00:00

pci-rc32434.c

MIPS: RC32434: Fix PCI build error

2011-09-21 17:51:57 +02:00

pci-sb1250.c

MIPS: SB1250: Include correct header and fix a warning

2010-04-30 20:52:43 +01:00

pci-tx4927.c

MIPS: irq: Remove IRQF_DISABLED

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

pci-tx4938.c

MIPS: irq: Remove IRQF_DISABLED

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

pci-tx4939.c

MIPS: irq: Remove IRQF_DISABLED

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

pci-vr41xx.c

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02:00

pci-vr41xx.h

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

pci-xlr.c

MIPS: Netlogic: Move code common with XLP to common/

2011-12-07 22:04:55 +00:00

pci-yosemite.c

MIPS: Set io_map_base for several PCI bridges lacking it

2010-07-26 19:08:19 +01:00

pci.c

MIPS: PCI: use list_for_each_entry() for bus->devices traversal

2012-02-20 18:33:19 +01:00

pcie-octeon.c

MIPS: Octeon: Add support for OCTEON II PCIe

2011-12-08 12:32:57 +00:00