Merge git://git.infradead.org/mtd-2.6
authorKaiGai Kohei <kaigai@ak.jp.nec.com>
Thu, 18 May 2006 15:43:53 +0000 (00:43 +0900)
committerKaiGai Kohei <kaigai@ak.jp.nec.com>
Thu, 18 May 2006 15:43:53 +0000 (00:43 +0900)

Trivial merge