From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 11 Jul 2005 17:18:18 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
X-Git-Tag: v2.6.13-rc3~93
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=200d481f28be4522464bb849dd0eb5f8cb6be781;p=thirdparty%2Flinux.git

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

200d481f28be4522464bb849dd0eb5f8cb6be781