Merge branch 'master' of /home/tglx/work/kernel/git/mtd-2.6/
authorThomas Gleixner <tglx@cruncher.tec.linutronix.de>
Tue, 23 May 2006 10:37:31 +0000 (12:37 +0200)
committerThomas Gleixner <tglx@cruncher.tec.linutronix.de>
Tue, 23 May 2006 10:37:31 +0000 (12:37 +0200)
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Trivial merge