Linus Torvalds 79346507ad Merge git://git.infradead.org/mtd-2.6 ... * git://git.infradead.org/mtd-2.6: (82 commits) mtd: fix build error in m25p80.c mtd: Remove redundant mutex from mtd_blkdevs.c MTD: Fix wrong check register_blkdev return value Revert "mtd: cleanup Kconfig dependencies" mtd: cfi_cmdset_0002: make sector erase command variable mtd: cfi_cmdset_0002: add CFI detection for SST 38VF640x chips mtd: cfi_util: add support for switching SST 39VF640xB chips into QRY mode mtd: cfi_cmdset_0001: use defined value of P_ID_INTEL_PERFORMANCE instead of hardcoded one block2mtd: dubious assignment P4080/mtd: Fix the freescale lbc issue with 36bit mode P4080/eLBC: Make Freescale elbc interrupt common to elbc devices mtd: phram: use KBUILD_MODNAME mtd: OneNAND: S5PC110: Fix double call suspend & resume function mtd: nand: fix MTD_MODE_RAW writes jffs2: use kmemdup mtd: sm_ftl: cosmetic, use bool when possible mtd: r852: remove useless pci powerup/down from suspend/resume routines mtd: blktrans: fix a race vs kthread_stop mtd: blktrans: kill BKL mtd: allow to unload the mtdtrans module if its block devices aren't open ... Fix up trivial whitespace-introduced conflict in drivers/mtd/mtdchar.c		2010-10-30 08:31:35 -07:00
..
alchemy	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-10-25 08:32:05 -07:00
ar7	MIPS: AR7: Add support for Titan (TNETV10xx) SoC variant	2010-10-29 19:08:46 +01:00
bcm47xx	MIPS: BCM47xx: Fix nvram_getenv return value.	2010-08-05 13:26:31 +01:00
bcm63xx	MIPS: Decouple BMIPS CPU support from bcm47xx/bcm63xx SoC code	2010-10-29 19:08:50 +01:00
boot	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus	2010-10-18 13:10:36 -07:00
cavium-octeon	MIPS: Add platform device and Kconfig for Octeon USB EHCI / OHCI	2010-10-29 19:08:45 +01:00
cobalt
configs	defconfig reduction	2010-08-14 22:26:53 +02:00
dec	Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags	2010-10-21 14:37:27 -07:00
emma	MIPS: Ritually kill stupid printk.	2010-08-05 13:26:27 +01:00
fw
include/asm	Merge git://git.infradead.org/mtd-2.6	2010-10-30 08:31:35 -07:00
jazz	MIPS: Add missing #inclusions of <linux/irq.h>	2010-10-07 14:08:54 +01:00
jz4740	MIPS: jz4740: Fix Kbuild Platform file.	2010-10-19 18:32:39 +01:00
kernel	MIPS: Make TASK_SIZE reflect proper size for both 32 and 64 bit processes.	2010-10-29 19:08:53 +01:00
lasat
lib
loongson	MIPS: Kconfig cleanup	2010-10-29 19:08:26 +01:00
math-emu	MIPS: add support for software performance events	2010-10-29 19:08:48 +01:00
mipssim
mm	MIPS: Honor L2 bypass bit	2010-10-29 19:08:52 +01:00
mti-malta	MIPS: Add missing #inclusions of <linux/irq.h>	2010-10-07 14:08:54 +01:00
nxp/pnx8550/common
oprofile
pci	MIPS: Octeon: Rewrite DMA mapping functions.	2010-10-29 19:08:32 +01:00
pmc-sierra	MIPS: Add missing #inclusions of <linux/irq.h>	2010-10-07 14:08:54 +01:00
pnx833x	MIPS: Fix gen_nand probe structures contents	2010-08-12 12:22:49 +01:00
pnx8550	MIPS: PNX8550: Sort out machine halt, restart and powerdown functions.	2010-10-04 18:33:57 +01:00
power
powertv	MIPS: Add missing #inclusions of <linux/irq.h>	2010-10-07 14:08:54 +01:00
rb532	MIPS: Add missing #inclusions of <linux/irq.h>	2010-10-07 14:08:54 +01:00
sgi-ip22
sgi-ip27
sgi-ip32
sibyte	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
sni	MIPS: Add missing #inclusions of <linux/irq.h>	2010-10-07 14:08:54 +01:00
txx9	MIPS: Add missing #inclusions of <linux/irq.h>	2010-10-07 14:08:54 +01:00
vr41xx	MIPS: Add missing #inclusions of <linux/irq.h>	2010-10-07 14:08:54 +01:00
wrppmc
Kbuild	MIPS: Repair Kbuild make clean breakage.	2010-10-19 18:32:39 +01:00
Kbuild.platforms
Kconfig	ftrace/MIPS: Enable C Version of recordmcount	2010-10-29 19:08:56 +01:00
Kconfig.debug	MIPS: IRQ: Add stackoverflow detection	2010-10-29 19:08:27 +01:00
Makefile	MIPS: Octeon: Apply CN63XXP1 errata workarounds.	2010-10-29 19:08:43 +01:00