Merge git://git.infradead.org/mtd-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 Apr 2011 20:23:50 +0000 (13:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 Apr 2011 20:23:50 +0000 (13:23 -0700)
commit510ec7bc3bf6bc6d87662d16a6136135d747e535
treec57d936028021c4f06c7bc4a020c431deecf4d35
parent94c8a984ae2adbd9a9626fb42e0f2faf3e36e86f
parent80b4f81a49809774f1b123c456fb179e472dbd0e
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