Merge branch 'master' of...

Documentation/DocBook/.gitignore

Documentation/DocBook/dvb/dvbapi.xml

Documentation/DocBook/dvb/dvbproperty.xml

Documentation/DocBook/dvb/frontend.h.xml

Documentation/DocBook/media-entities.tmpl

Documentation/DocBook/v4l/pixfmt-m420.xml

Documentation/DocBook/v4l/pixfmt-y10b.xml

Documentation/DocBook/v4l/pixfmt.xml

Documentation/DocBook/v4l/subdev-formats.xml

Documentation/DocBook/v4l/videodev2.h.xml

Documentation/feature-removal-schedule.txt

Documentation/ioctl/ioctl-number.txt

Documentation/video4linux/CARDLIST.em28xx

Documentation/video4linux/Zoran

Documentation/video4linux/gspca.txt

Documentation/video4linux/uvcvideo.txt

arch/sh/Kconfig

arch/sh/boards/mach-ecovec24/setup.c

arch/sh/configs/ecovec24_defconfig

arch/sh/configs/sh7757lcr_defconfig