From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Dec 2009 18:23:43 +0000 (-0800)
Subject: Merge git://git.infradead.org/mtd-2.6
X-Git-Tag: v2.6.33-rc1~66
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=60d9aa758c00f20ade0cb1951f6a934f628dd2d7

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

* git://git.infradead.org/mtd-2.6: (90 commits)
  jffs2: Fix long-standing bug with symlink garbage collection.
  mtd: OneNAND: Fix test of unsigned in onenand_otp_walk()
  mtd: cfi_cmdset_0002, fix lock imbalance
  Revert "mtd: move mxcnd_remove to .exit.text"
  mtd: m25p80: add support for Macronix MX25L4005A
  kmsg_dump: fix build for CONFIG_PRINTK=n
  mtd: nandsim: add support for 4KiB pages
  mtd: mtdoops: refactor as a kmsg_dumper
  mtd: mtdoops: make record size configurable
  mtd: mtdoops: limit the maximum mtd partition size
  mtd: mtdoops: keep track of used/unused pages in an array
  mtd: mtdoops: several minor cleanups
  core: Add kernel message dumper to call on oopses and panics
  mtd: add ARM pismo support
  mtd: pxa3xx_nand: Fix PIO data transfer
  mtd: nand: fix multi-chip suspend problem
  mtd: add support for switching old SST chips into QRY mode
  mtd: fix M29W800D dev_id and uaddr
  mtd: don't use PF_MEMALLOC
  mtd: Add bad block table overrides to Davinci NAND driver
  ...

Fixed up conflicts (mostly trivial) in
	drivers/mtd/devices/m25p80.c
	drivers/mtd/maps/pcmciamtd.c
	drivers/mtd/nand/pxa3xx_nand.c
	kernel/printk.c
---

60d9aa758c00f20ade0cb1951f6a934f628dd2d7
diff --cc drivers/mtd/devices/m25p80.c
index 4c19269de91a,ae1bfb2ce1e0..f3f4768d6e18
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@@ -21,7 -21,7 +21,8 @@@
  #include <linux/interrupt.h>
  #include <linux/mutex.h>
  #include <linux/math64.h>
 +#include <linux/sched.h>
+ #include <linux/mod_devicetable.h>
  
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
diff --cc kernel/printk.c
index b5ac4d99c667,2a564570f822..1ded8e7dd19b
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@@ -33,7 -33,7 +33,8 @@@
  #include <linux/bootmem.h>
  #include <linux/syscalls.h>
  #include <linux/kexec.h>
 +#include <linux/ratelimit.h>
+ #include <linux/kmsg_dump.h>
  
  #include <asm/uaccess.h>