Merge branch 'master' of /home/tglx/work/mtd/git/linux-2.6.git/
authorThomas Gleixner <tglx@mtd.linutronix.de>
Sun, 6 Nov 2005 14:36:37 +0000 (15:36 +0100)
committerThomas Gleixner <tglx@mtd.linutronix.de>
Sun, 6 Nov 2005 14:36:37 +0000 (15:36 +0100)
1  2 
drivers/mtd/mtdchar.c

Simple merge