Merge git://git.infradead.org/mtd-2.6
commitb9e26dfdad5a4f9cbdaacafac6998614cc9c41bc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Dec 2011 02:39:37 +0000 (20 18:39 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Dec 2011 02:39:37 +0000 (20 18:39 -0800)
tree320442f423d38ae2eeafe0764985c72af9adaed2
parent11da3764a7b413c4e66138bd7bdb5bacd11617a6
parentc32987918efaa6949c5b2f3e43b654a742b18f7d
Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6:
  mtd: plat_ram: call mtd_device_register only if partition data exists
  mtd: pxa2xx-flash.c: It used to fall back to provided table.
  mtd: gpmi: add missing include 'module.h'
  mtd: ndfc: fix typo in structure dereference