80b0cbda
parent 5c6cce92bc8aee751aafe82c5d9caf7553226a3d
parent 63da029015b5255915cd6d61f19ffc276ad4635d
author Linus Torvalds <torvalds@linux-foundation.org> 1306932459 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1306932459 +0900

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

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