Auto merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Documentation/dontdiff

Documentation/feature-removal-schedule.txt

Documentation/filesystems/ntfs.txt

arch/arm/configs/shark_defconfig

arch/arm/kernel/traps.c

arch/arm/lib/bitops.h

arch/arm/lib/io-shark.c

arch/arm/mach-shark/core.c

arch/x86_64/ia32/syscall32.c

drivers/mtd/nand/nand_base.c

drivers/mtd/nand/nand_bbt.c

drivers/serial/crisv10.c

drivers/serial/icom.c

drivers/serial/jsm/jsm.h

fs/jffs2/erase.c

fs/ntfs/ChangeLog

fs/ntfs/Makefile

fs/ntfs/aops.c

fs/ntfs/attrib.c

fs/ntfs/attrib.h