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)
commit4cbb9b80e171107c6c34116283fe38e5a396c68b
tree9463f2e4774f14752cf4bb52431e14e569256f72
parent6dfc6d250d0b7ebaa6423c44dcd09fcfe68deabd
parent9fe4854cd1f60273f9a3ece053f4789605f58a5e
Merge branch 'master' of /home/tglx/work/kernel/git/mtd-2.6/

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
drivers/mtd/nand/au1550nd.c
drivers/mtd/nand/diskonchip.c
drivers/mtd/nand/nand_base.c
drivers/mtd/nand/nandsim.c
drivers/mtd/nand/rtc_from4.c
fs/jffs2/wbuf.c