From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 13 Jul 2005 19:19:30 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
X-Git-Tag: v2.6.13-rc4~117
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3720bd8b1e16b41b9ec640bf91f12e1a1b5cb961;p=linux-2.6

Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
---

3720bd8b1e16b41b9ec640bf91f12e1a1b5cb961