From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 9 Apr 2011 20:23:50 +0000 (-0700)
Subject: Merge git://git.infradead.org/mtd-2.6
X-Git-Tag: v3.0~1050
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=510ec7bc3bf6bc6d87662d16a6136135d747e535;p=platform%2Fkernel%2Flinux-amlogic.git

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

* git://git.infradead.org/mtd-2.6:
  mtd: atmel_nand: use CPU I/O when buffer is in vmalloc(ed) region
  mtd: atmel_nand: modify test case for using DMA operations
  mtd: atmel_nand: fix support for CPUs that do not support DMA access
  mtd: atmel_nand: trivial: change DMA usage information trace
  mtd: mtdswap: fix printk format warning
---

510ec7bc3bf6bc6d87662d16a6136135d747e535