err.no Git - linux-2.6/commit

]> err.no Git - linux-2.6/commit

author	Linus Torvalds <torvalds@g5.osdl.org>
	Mon, 7 Nov 2005 18:24:08 +0000 (10:24 -0800)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Mon, 7 Nov 2005 18:24:08 +0000 (10:24 -0800)
commit	b3ce1debe2685383a9ad6ace9c49869c3968c013
tree	dcb606fac467d6ce78a9c608a1e0d2323af44f2b	tree \| snapshot
parent	5b2f7ffcb734d3046144dfbd5ac6d76254a9e522	commit \| diff
parent	c2965f1129ee54afcc4ef293ff0f25fa3a7e7392	commit \| diff

Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6

Some manual fixups for clashing kfree() cleanups etc.

22 files changed:

drivers/mtd/chips/cfi_cmdset_0001.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/chips/cfi_cmdset_0002.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/devices/blkmtd.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/inftlcore.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/inftlmount.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/amd76xrom.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/bast-flash.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/ichxrom.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/integrator-flash.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/ipaq-flash.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/iq80310.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/ixp2000.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/ixp4xx.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/lubbock-flash.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/omap-toto-flash.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/sa1100-flash.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/sun_uflash.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/tqm8xxl.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/nand_base.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nftlcore.c	diff1 \|	diff2 \|	blob \| history
fs/Kconfig	diff1 \|	diff2 \|	blob \| history
fs/jffs2/wbuf.c	diff1 \|	diff2 \|	blob \| history

Linux 2.6 source tree

drivers/mtd/chips/cfi_cmdset_0001.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/chips/cfi_cmdset_0002.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/devices/blkmtd.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/inftlcore.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/inftlmount.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/amd76xrom.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/bast-flash.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/ichxrom.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/integrator-flash.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/ipaq-flash.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/iq80310.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/ixp2000.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/ixp4xx.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/lubbock-flash.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/omap-toto-flash.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/sa1100-flash.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/sun_uflash.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/tqm8xxl.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/nand_base.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nftlcore.c	diff1 \|	diff2 \|	blob \| history
fs/Kconfig	diff1 \|	diff2 \|	blob \| history
fs/jffs2/wbuf.c	diff1 \|	diff2 \|	blob \| history