Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6

Documentation/spi/butterfly

Documentation/spi/spi-summary

arch/arm/Kconfig

drivers/Kconfig

drivers/Makefile

drivers/input/touchscreen/Kconfig

drivers/input/touchscreen/Makefile

drivers/input/touchscreen/ads7846.c

drivers/mtd/devices/Kconfig

drivers/mtd/devices/Makefile

drivers/mtd/devices/m25p80.c

drivers/mtd/devices/mtd_dataflash.c

drivers/spi/Kconfig

drivers/spi/Makefile

drivers/spi/spi.c

drivers/spi/spi_bitbang.c

drivers/spi/spi_butterfly.c

include/linux/spi/ads7846.h

include/linux/spi/flash.h

include/linux/spi/spi.h