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
..
Kconfig	MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines	2011-10-24 23:34:24 +01:00
Makefile	spi: remove obsolete spi-s3c24xx-gpio driver	2011-07-04 10:52:58 -06:00
spi-altera.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-ath79.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-atmel.c	Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6	2011-10-29 07:28:36 -07:00
spi-au1550.c	spi: reorganize drivers	2011-06-06 01:16:30 -06:00
spi-bfin5xx.c	spi: irq: Remove IRQF_DISABLED	2011-10-24 14:14:40 +02:00
spi-bfin-sport.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-bitbang-txrx.h	spi: reorganize drivers	2011-06-06 01:16:30 -06:00
spi-bitbang.c	spi: reorganize drivers	2011-06-06 01:16:30 -06:00
spi-butterfly.c	spi: reorganize drivers	2011-06-06 01:16:30 -06:00
spi-coldfire-qspi.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-davinci.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-dw-mid.c	spi: spi-dw: fix all sparse warnings	2011-09-21 09:41:48 -06:00
spi-dw-mmio.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-dw-pci.c	spi: reorganize drivers	2011-06-06 01:16:30 -06:00
spi-dw.c	spi: spi-dw: fix all sparse warnings	2011-09-21 09:41:48 -06:00
spi-dw.h	spi: spi-dw: fix all sparse warnings	2011-09-21 09:41:48 -06:00
spi-ep93xx.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-fsl-espi.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-fsl-lib.c	spi: reorganize drivers	2011-06-06 01:16:30 -06:00
spi-fsl-lib.h	spi: reorganize drivers	2011-06-06 01:16:30 -06:00
spi-fsl-spi.c	spi: Fix WARN when removing spi-fsl-spi module	2011-09-23 17:28:29 -06:00
spi-gpio.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-imx.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-lm70llp.c	spi: reorganize drivers	2011-06-06 01:16:30 -06:00
spi-mpc52xx-psc.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-mpc52xx.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-mpc512x-psc.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-nuc900.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-oc-tiny.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-omap2-mcspi.c	OMAP: SPI: Fix the trying to free nonexistent resource error	2011-10-24 13:44:30 +02:00
spi-omap-100k.c	spi: reorganize drivers	2011-06-06 01:16:30 -06:00
spi-omap-uwire.c	spi: reorganize drivers	2011-06-06 01:16:30 -06:00
spi-orion.c	spi: Convert uses of struct resource * to resource_size(ptr)	2011-06-10 23:43:41 -06:00
spi-pl022.c	Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6	2011-10-29 07:28:36 -07:00
spi-ppc4xx.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-pxa2xx-pci.c	spi: reorganize drivers	2011-06-06 01:16:30 -06:00
spi-pxa2xx.c	spi: reorganize drivers	2011-06-06 01:16:30 -06:00
spi-s3c24xx-fiq.h	spi: reorganize drivers	2011-06-06 01:16:30 -06:00
spi-s3c24xx-fiq.S	spi: reorganize drivers	2011-06-06 01:16:30 -06:00
spi-s3c24xx.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-s3c64xx.c	Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6	2011-07-22 14:52:44 -07:00
spi-sh-msiof.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-sh-sci.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-sh.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-stmp.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-tegra.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-ti-ssp.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi-tle62x0.c	spi: reorganize drivers	2011-06-06 01:16:30 -06:00
spi-topcliff-pch.c	spi-topcliff-pch: Fix overrun issue	2011-10-04 10:10:50 -06:00
spi-txx9.c	spi: reorganize drivers	2011-06-06 01:16:30 -06:00
spi-xilinx.c	drivercore: Add helper macro for platform_driver boilerplate	2011-10-25 00:35:47 +02:00
spi.c	spi: reorganize drivers	2011-06-06 01:16:30 -06:00
spidev.c	spi: reorganize drivers	2011-06-06 01:16:30 -06:00