From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 13 Nov 2005 20:30:14 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
X-Git-Tag: v2.6.15-rc2~212
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41866a56cc4e676240b94ed8eaeca375aaef7496;p=linux-2.6

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

41866a56cc4e676240b94ed8eaeca375aaef7496