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)
Update to 2.6.12-rc3

1  2 
drivers/mtd/maps/Kconfig

Simple merge