Merge remote-tracking branch 'trivial/for-next'

Conflicts:
	sound/soc/imx/Kconfig

diff --cc Documentation/DocBook/media/v4l/controls.xml
Simple merge

diff --cc Documentation/hwmon/it87
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/mips/lantiq/xway/gpio.c
Simple merge

diff --cc arch/mips/lantiq/xway/gpio_stp.c
Simple merge

diff --cc arch/mips/pci/pci-lantiq.c
Simple merge

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/i2c/busses/Kconfig
Simple merge

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc drivers/mtd/devices/docg3.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169.c
Simple merge

diff --cc drivers/net/irda/Kconfig
Simple merge

diff --cc drivers/ptp/Kconfig
Simple merge

diff --cc drivers/regulator/tps65910-regulator.c
Simple merge

diff --cc drivers/scsi/scsi_error.c
Simple merge

diff --cc drivers/video/au1100fb.c
Simple merge

diff --cc fs/btrfs/disk-io.c
Simple merge

diff --cc sound/pci/hda/patch_realtek.c
Simple merge