From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 16 Jul 2005 17:24:32 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
X-Git-Tag: v2.6.13-rc4~90
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fa4aad496b9c96fcde6c8f905a43ae6733e5a79;p=linux-2.6

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

1fa4aad496b9c96fcde6c8f905a43ae6733e5a79