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)
commit3f303103b884ca577908d3e5c0650ad12e40c586
tree021b8baeba20df329b60798ad4fb55f280b0cbda
parent5c6cce92bc8aee751aafe82c5d9caf7553226a3d
parent63da029015b5255915cd6d61f19ffc276ad4635d
Merge git://git.infradead.org/mtd-2.6

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