From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Nov 2009 21:23:16 +0000 (-0800)
Subject: Merge git://git.infradead.org/users/dwmw2/mtd-2.6.32
X-Git-Tag: v3.0~7016
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4397989fc91ed289909ecf307c2dc21cee0e7905;p=platform%2Fkernel%2Flinux-amlogic.git

Merge git://git.infradead.org/users/dwmw2/mtd-2.6.32

* git://git.infradead.org/users/dwmw2/mtd-2.6.32:
  mtd/maps: gpio-addr-flash: depend on GPIO arch support
  mtd/maps: gpio-addr-flash: pull in linux/ headers rather than asm/
  mtd: nand: fix htmldocs warnings
---

4397989fc91ed289909ecf307c2dc21cee0e7905