Merge with rsync://fileserver/linux
authorArtem B. Bityuckiy <dedekind@infradead.org>
Wed, 6 Jul 2005 14:43:18 +0000 (15:43 +0100)
committerThomas Gleixner <tglx@mtd.linutronix.de>
Wed, 6 Jul 2005 17:40:38 +0000 (19:40 +0200)
commitb3539219c9ea20ebf6a5ea3cc534f423a3607c41
treed17c31c0eac0a7290ba5011b59a100fd9e9c9532
parent6430a8def12edebc1c9c7c2621d33ca0e8653c33
parenta18bcb7450840f07a772a45229de4811d930f461
Merge with rsync://fileserver/linux

Update to 2.6.12-rc3
drivers/mtd/maps/Kconfig