Merge git://git.infradead.org/mtd-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Jun 2011 12:47:39 +0000 (21:47 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
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