Merge git://git.infradead.org/~dwmw2/mtd-2.6.33
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Jan 2010 18:31:34 +0000 (10:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Jan 2010 18:31:34 +0000 (10:31 -0800)
commitb8be634e01b400fa2528848ad0cd6a5580a15bc4
treef36da264249540727a60e13a54d1d44c8821b48d
parent298a4c3a57fed38df365a6807728d1930a72c728
parentf5e2bae0aad03164ffc7ce9dfeee6608e2c87dba
Merge git://git.infradead.org/~dwmw2/mtd-2.6.33

* git://git.infradead.org/~dwmw2/mtd-2.6.33:
  mtd: tests: fix read, speed and stress tests on NOR flash
  mtd: Really add ARM pismo support
  kmsg_dump: Dump on crash_kexec as well
kernel/kexec.c
kernel/printk.c