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

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (37 commits)
  MIPS: O32: Provide definition of registers ta0 .. ta3.
  MIPS: perf: Add Octeon support for hardware perf.
  MIPS: perf: Add support for 64-bit perf counters.
  MIPS: perf: Reorganize contents of perf support files.
  MIPS: perf: Cleanup formatting in arch/mips/kernel/perf_event.c
  MIPS: Add accessor macros for 64-bit performance counter registers.
  MIPS: Add probes for more Octeon II CPUs.
  MIPS: Add more CPU identifiers for Octeon II CPUs.
  MIPS: XLR, XLS: Add comment for smp setup
  MIPS: JZ4740: GPIO: Check correct IRQ in demux handler
  MIPS: JZ4740: GPIO: Simplify IRQ demuxer
  MIPS: JZ4740: Use generic irq chip
  MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines
  MIPS: Alchemy: kill au1xxx.h header
  MIPS: Alchemy: clean DMA code of CONFIG_SOC_AU1??? defines
  MIPS, IDE: Alchem, au1xxx-ide: Remove pb1200/db1200 header dep
  MIPS: Alchemy: Redo PCI as platform driver
  MIPS: Alchemy: more base address cleanup
  MIPS: Alchemy: rewrite USB platform setup.
  MIPS: Alchemy: abstract USB block control register access
  ...

Fix up trivial conflicts in:
	arch/mips/alchemy/devboards/db1x00/platform.c
	drivers/ide/Kconfig
	drivers/mmc/host/au1xmmc.c
	drivers/video/Kconfig
	sound/mips/Kconfig

2011-11-03 13:28:14 -07:00

..

alauda.c

mtd: convert remaining users to mtd_device_register()

2011-05-25 02:25:00 +01:00

ams-delta.c

ARM: gpio: omap: convert drivers to use asm/gpio.h rather than mach/gpio.h

2011-08-08 14:27:44 +01:00

atmel_nand_ecc.h

…

atmel_nand.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2011-07-25 13:56:39 -07:00

au1550nd.c

MIPS: Alchemy: kill au1xxx.h header

2011-10-24 23:34:24 +01:00

autcpu12.c

mtd: convert remaining users to mtd_device_register()

2011-05-25 02:25:00 +01:00

bcm_umi_bch.c

mtd: add bcmring nand driver

2009-10-20 10:07:23 +09:00

bcm_umi_nand.c

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

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

bf5xx_nand.c

mtd: bf5xx_nand: convert to mtd_device_register()

2011-05-25 02:23:15 +01:00

cafe_nand.c

mtd: cafe_nand: convert to mtd_device_register()

2011-05-25 02:23:16 +01:00

cmx270_nand.c

mtd: convert remaining users to mtd_device_register()

2011-05-25 02:25:00 +01:00

cs553x_nand.c

mtd: cs553x_nand: convert to mtd_device_register()

2011-05-25 02:23:18 +01:00

davinci_nand.c

mtd: davinci_nand: convert to mtd_device_register()

2011-05-25 02:23:20 +01:00

denali.c

mtd: convert remaining users to mtd_device_register()

2011-05-25 02:25:00 +01:00

denali.h

mtd: denali: detect the number of banks

2011-05-25 02:02:12 +01:00

diskonchip.c

mtd: diskonchip: convert to mtd_device_register()

2011-05-25 02:23:21 +01:00

edb7312.c

mtd: edb7312 nand: convert to mtd_device_register()

2011-05-25 02:23:23 +01:00

fsl_elbc_nand.c

powerpc/85xx: fix NAND_CMD_READID read bytes number

2011-06-22 06:08:48 -05:00

fsl_upm.c

mtd: fsl_upm: convert to mtd_device_register()

2011-05-25 02:23:26 +01:00

fsmc_nand.c

mtd: fsmc_nand: convert to mtd_device_register()

2011-05-25 02:23:28 +01:00

gpio.c

mtd: convert remaining users to mtd_device_register()

2011-05-25 02:25:00 +01:00

h1910.c

mtd: h1910: convert to mtd_device_register()

2011-05-25 02:23:29 +01:00

jz4740_nand.c

mtd: jz4740_nand: convert to mtd_device_register()

2011-05-25 02:23:30 +01:00

Kconfig

MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines

2011-10-24 23:34:24 +01:00

Makefile

mtd: nand: add software BCH ECC support

2011-03-11 17:49:08 +00:00

mpc5121_nfc.c

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

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

mxc_nand.c

mtd: mxc_nand: convert to mtd_device_register()

2011-05-25 02:23:38 +01:00

nand_base.c

mtd: nand: convert to mtd_device_register()

2011-05-25 02:20:13 +01:00

nand_bbt.c

mtd: nand: dynamic allocation of flash-based BBT structs

2011-05-25 01:50:14 +01:00

nand_bch.c

mtd: nand: add software BCH ECC support

2011-03-11 17:49:08 +00:00

nand_bcm_umi.c

mtd: add bcmring nand driver

2009-10-20 10:07:23 +09:00

nand_bcm_umi.h

mtd: nand_bcm: fix hot spin and code duplication

2010-02-26 16:56:35 +00:00

nand_ecc.c

Merge git://git.infradead.org/mtd-2.6

2009-12-16 10:23:43 -08:00

nand_ids.c

mtd: nand: support new Toshiba SLC

2010-10-24 23:38:30 +01:00

nandsim.c

mtd: convert remaining users to mtd_device_register()

2011-05-25 02:25:00 +01:00

ndfc.c

mtd: ndfc: convert to mtd_device_register()

2011-05-25 02:23:44 +01:00

nomadik_nand.c

mtd: nomadik_nand: convert to mtd_device_register()

2011-05-25 02:23:45 +01:00

nuc900_nand.c

mtd: convert remaining users to mtd_device_register()

2011-05-25 02:25:00 +01:00

omap2.c

mtd: omap2: convert to mtd_device_register()

2011-05-25 02:23:46 +01:00

orion_nand.c

mtd: orion_nand: convert to mtd_device_register()

2011-05-25 02:23:47 +01:00

pasemi_nand.c

mtd: convert remaining users to mtd_device_register()

2011-05-25 02:25:00 +01:00

plat_nand.c

mtd: plat_nand: convert to mtd_device_register()

2011-05-25 02:20:24 +01:00

ppchameleonevb.c

mtd: ppchameleonevb: convert to mtd_device_register()

2011-05-25 02:23:48 +01:00

pxa3xx_nand.c

mtd: pxa: convert to mtd_device_register()

2011-05-25 02:20:48 +01:00

r852.c

Fix common misspellings

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

r852.h

mtd: r852: remove useless pci powerup/down from suspend/resume routines

2010-10-25 01:32:21 +01:00

rtc_from4.c

mtd: convert remaining users to mtd_device_register()

2011-05-25 02:25:00 +01:00

s3c2410.c

mtd: s3c2410 nand: convert to mtd_device_register()

2011-05-25 02:23:52 +01:00

sh_flctl.c

mtd: convert remaining users to mtd_device_register()

2011-05-25 02:25:00 +01:00

sharpsl.c

mtd: sharpsl: convert to mtd_device_register()

2011-05-25 02:23:53 +01:00

sm_common.c

mtd: convert remaining users to mtd_device_register()

2011-05-25 02:25:00 +01:00

sm_common.h

mtd: sm_common: split smartmedia and xD table

2010-05-14 01:03:46 +01:00

socrates_nand.c

mtd: socrates_nand: convert to mtd_device_register()

2011-05-25 02:23:54 +01:00

spia.c

mtd: convert remaining users to mtd_device_register()

2011-05-25 02:25:00 +01:00

tmio_nand.c

Merge git://git.infradead.org/mtd-2.6

2011-05-27 20:06:53 -07:00

txx9ndfmc.c

mtd: txx9ndfmc: convert to mtd_device_register()

2011-05-25 02:23:57 +01:00