Merge git://git.infradead.org/mtd-2.6
Linus Torvalds [Wed, 1 Jun 2011 12:47:39 +0000 (21:47 +0900)]
* git://git.infradead.org/mtd-2.6:
  mtd: fix physmap.h warnings


Trivial merge