From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 1 Jun 2011 12:47:39 +0000 (+0900)
Subject: Merge git://git.infradead.org/mtd-2.6
X-Git-Tag: v3.0-rc2~20
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3f303103b884ca577908d3e5c0650ad12e40c586;p=users%2Fdwmw2%2Flinux.git

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

* git://git.infradead.org/mtd-2.6:
  mtd: fix physmap.h warnings
---

3f303103b884ca577908d3e5c0650ad12e40c586