]> www.infradead.org Git - linux-platform-drivers-x86.git/commitdiff
projects / linux-platform-drivers-x86.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 298a4c3 f5e2bae)
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)
* 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

1  2 
kernel/kexec.c patch | diff1 | diff2 | blob | history
kernel/printk.c patch | diff1 | diff2 | blob | history

diff --cc kernel/kexec.c
Simple merge
diff --cc kernel/printk.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.