]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge tag 'v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorLothar Waßmann <LW@KARO-electronics.de>
Mon, 7 Mar 2016 14:09:00 +0000 (15:09 +0100)
committerLothar Waßmann <LW@KARO-electronics.de>
Mon, 7 Mar 2016 14:09:00 +0000 (15:09 +0100)
commit2d03bf0f98987735fcfa8c977e5a0ba46252d5a6
tree703a8d0b9373c69dcc9a7493b4769bd4453fc2ee
parent92f3d4a3ce2c4c5093ebf0cd08318fc77a85abf4
parentafd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc
Merge tag 'v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mainline

Linux 4.4

Conflicts:
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/imx28-tx28.dts
drivers/gpio/gpio-pca953x.c
drivers/gpu/drm/imx/imx-drm-core.c
drivers/gpu/drm/tilcdc/tilcdc_panel.c
drivers/pwm/pwm-imx.c
drivers/usb/musb/Kconfig
drivers/usb/musb/musb_core.c
drivers/video/backlight/pwm_bl.c
include/linux/pwm.h
sound/soc/codecs/sgtl5000.c
31 files changed:
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/am335x-boneblack.dts
arch/arm/boot/dts/am335x-evm.dts
arch/arm/boot/dts/am335x-evmsk.dts
arch/arm/boot/dts/am335x-igep0033.dtsi
arch/arm/boot/dts/am335x-nano.dts
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/imx53-tx53-x03x.dts
arch/arm/boot/dts/imx53-tx53.dtsi
drivers/clk/ti/clk.c
drivers/leds/trigger/ledtrig-gpio.c
drivers/mfd/ti_am335x_tscadc.c
drivers/pwm/core.c
drivers/pwm/pwm-atmel-tcb.c
drivers/pwm/pwm-atmel.c
drivers/pwm/pwm-imx.c
drivers/pwm/pwm-pxa.c
drivers/pwm/pwm-renesas-tpu.c
drivers/pwm/pwm-samsung.c
drivers/pwm/pwm-tiecap.c
drivers/pwm/pwm-tiehrpwm.c
drivers/pwm/pwm-vt8500.c
drivers/regulator/ltc3589.c
drivers/spi/spi-omap2-mcspi.c
drivers/usb/musb/musb_core.c
drivers/usb/phy/phy-am335x-control.c
drivers/usb/phy/phy-am335x.c
include/linux/pwm.h
sound/soc/codecs/sgtl5000.c
sound/soc/davinci/Kconfig
sound/soc/davinci/Makefile