From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 21 Dec 2011 02:39:37 +0000 (-0800)
Subject: Merge git://git.infradead.org/mtd-2.6
X-Git-Tag: upstream/snapshot3+hdmi~8522
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b9e26dfdad5a4f9cbdaacafac6998614cc9c41bc;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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
---

b9e26dfdad5a4f9cbdaacafac6998614cc9c41bc