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

..

chips

mtd: remove duplicate assignment of chip->state

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

devices

Change Ryan Mallon's email address across the kernel

2011-06-16 11:22:05 +02:00

lpddr

mtd: remove duplicate assignment of chip->state

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

maps

MIPS: Lantiq: Fix MTD registration of NOR device

2011-10-20 15:00:17 +01:00

nand

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

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

onenand

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

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

tests

mtd: speedtest: fix integer overflow

2011-03-11 14:22:49 +00:00

ubi

UBI: do not link debug messages when debugging is disabled

2011-08-19 19:02:27 +03:00

afs.c

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00

ar7part.c

[MTD] mtdpart: Make all partition parsers return allocated array

2009-03-20 18:55:17 +00:00

cmdlinepart.c

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00

ftl.c

Update broken web addresses in the kernel.

2010-10-18 11:03:14 +02:00

inftlcore.c

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00

inftlmount.c

mtd: Remove obsolete <mtd/compatmac.h> include

2010-08-08 21:19:42 +01:00

Kconfig

doc: fix broken references

2011-09-27 18:08:04 +02:00

Makefile

mtd: kill CONFIG_MTD_PARTITIONS

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

mtd_blkdevs.c

mtd: mtd_blkdevs: fix error path in blktrans_open

2011-05-25 01:53:45 +01:00

mtdblock_ro.c

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00

mtdblock.c

Fix common misspellings

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

mtdchar.c

filesystems: add missing nlink wrappers

2011-11-02 12:53:43 +01:00

mtdconcat.c

mtd: mtdconcat: fix NAND OOB write

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

mtdcore.c

mtd: remove add_mtd_partitions, add_mtd_device and friends

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

mtdcore.h

mtd: remove add_mtd_partitions, add_mtd_device and friends

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

mtdoops.c

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

2011-01-17 11:15:30 -08:00

mtdpart.c

mtd: remove add_mtd_partitions, add_mtd_device and friends

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

mtdsuper.c

convert get_sb_mtd() users to ->mount()

2010-10-29 04:16:26 -04:00

mtdswap.c

mtd: mtdswap: fix possible null dereference

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

nftlcore.c

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00

nftlmount.c

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00

ofpart.c

mtd: Fix endianness issues from device tree

2010-10-25 00:55:56 +01:00

redboot.c

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00

rfd_ftl.c

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00

sm_ftl.c

Fix common misspellings

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

sm_ftl.h

mtd: sm_ftl: cosmetic, use bool when possible

2010-10-25 01:33:08 +01:00

ssfdc.c

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00