Merge branch 'master' into for-next

...mentation/ABI/testing/sysfs-devices-platform-_UDC_-gadget

Documentation/DocBook/Makefile

Documentation/DocBook/v4l/lirc_device_interface.xml

Documentation/DocBook/v4l/pixfmt-packed-rgb.xml

Documentation/feature-removal-schedule.txt

Documentation/filesystems/Locking

Documentation/filesystems/porting

Documentation/kernel-parameters.txt

Documentation/usb/ehci.txt

Documentation/usb/gadget_multi.txt

Documentation/usb/gadget_serial.txt

Documentation/usb/hotplug.txt

Documentation/usb/linux-cdc-acm.inf

Documentation/usb/linux.inf

Documentation/video4linux/v4l2-controls.txt

MAINTAINERS

arch/alpha/include/asm/ioctls.h

arch/alpha/include/asm/scatterlist.h

arch/alpha/include/asm/termbits.h

arch/alpha/kernel/osf_sys.c