Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

Documentation/DocBook/videobook.tmpl

Documentation/cachetlb.txt

Documentation/hpet.txt

Documentation/input/ff.txt

Documentation/ioctl/hdio.txt

Documentation/laptop-mode.txt

Documentation/networking/sk98lin.txt

Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl

Documentation/x86_64/boot-options.txt

MAINTAINERS

arch/i386/kernel/vm86.c

arch/um/include/sysdep-i386/checksum.h

drivers/block/floppy.c

drivers/char/Kconfig

drivers/char/ftape/Kconfig

drivers/char/stallion.c

drivers/net/Kconfig

drivers/net/wan/lmc/lmc_main.c

drivers/net/wireless/Kconfig

drivers/s390/scsi/zfcp_erp.c