From: Linus Torvalds Date: Mon, 25 Mar 2013 16:26:10 +0000 (-0700) Subject: Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc X-Git-Tag: next-20130326~123 X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=fb9bb1829ddf6692cd31b28183688b42e1eda149;hp=-c;p=karo-tx-linux.git Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC bug fixes from Arnd Bergmann: "Four patches for arm-soc this week: - Kevin Hilman is no longer reachable under his previous email address. He submitted the patch earlier, but nobody felt responsible to pick it up. - One Tegra fix for an incorect register address in device tree. - IMX multiplatform support exposes a configuration option that leads to unbootable kernels on all other machines and that needs to depend on that platform. - A nontrivial bug fix for the setup of the mxs video output." * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: MAINTAINERS: update email address for Kevin Hilman ARM: tegra: fix register address of slink controller ARM: imx: add dependency check for DEBUG_IMX_UART_PORT ARM: video: mxs: Fix mxsfb misconfiguring VDCTRL0 --- fb9bb1829ddf6692cd31b28183688b42e1eda149 diff --combined MAINTAINERS index 4cf5fd334a06,89573ca56a1d..72b08438d536 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -1338,6 -1338,12 +1338,6 @@@ S: Maintaine F: drivers/platform/x86/asus*.c F: drivers/platform/x86/eeepc*.c -ASUS ASB100 HARDWARE MONITOR DRIVER -M: "Mark M. Hoffman" -L: lm-sensors@lm-sensors.org -S: Maintained -F: drivers/hwmon/asb100.c - ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API M: Dan Williams W: http://sourceforge.net/projects/xscaleiop @@@ -1461,12 -1467,6 +1461,12 @@@ F: drivers/dma/at_hdmac. F: drivers/dma/at_hdmac_regs.h F: include/linux/platform_data/dma-atmel.h +ATMEL I2C DRIVER +M: Ludovic Desroches +L: linux-i2c@vger.kernel.org +S: Supported +F: drivers/i2c/busses/i2c-at91.c + ATMEL ISI DRIVER M: Josh Wu L: linux-media@vger.kernel.org @@@ -2629,7 -2629,7 +2629,7 @@@ F: include/uapi/drm INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets) M: Daniel Vetter -L: intel-gfx@lists.freedesktop.org (subscribers-only) +L: intel-gfx@lists.freedesktop.org L: dri-devel@lists.freedesktop.org T: git git://people.freedesktop.org/~danvet/drm-intel S: Supported @@@ -3851,7 -3851,7 +3851,7 @@@ F: drivers/i2c/busses/i2c-ismt. F: Documentation/i2c/busses/i2c-ismt I2C/SMBUS STUB DRIVER -M: "Mark M. Hoffman" +M: Jean Delvare L: linux-i2c@vger.kernel.org S: Maintained F: drivers/i2c/i2c-stub.c @@@ -5647,14 -5647,6 +5647,14 @@@ S: Maintaine F: drivers/video/riva/ F: drivers/video/nvidia/ +NVM EXPRESS DRIVER +M: Matthew Wilcox +L: linux-nvme@lists.infradead.org +T: git git://git.infradead.org/users/willy/linux-nvme.git +S: Supported +F: drivers/block/nvme.c +F: include/linux/nvme.h + OMAP SUPPORT M: Tony Lindgren L: linux-omap@vger.kernel.org @@@ -5683,7 -5675,7 +5683,7 @@@ S: Maintaine F: arch/arm/*omap*/*clock* OMAP POWER MANAGEMENT SUPPORT - M: Kevin Hilman + M: Kevin Hilman L: linux-omap@vger.kernel.org S: Maintained F: arch/arm/*omap*/*pm* @@@ -5777,7 -5769,7 +5777,7 @@@ F: arch/arm/*omap*/usb OMAP GPIO DRIVER M: Santosh Shilimkar - M: Kevin Hilman + M: Kevin Hilman L: linux-omap@vger.kernel.org S: Maintained F: drivers/gpio/gpio-omap.c @@@ -7173,7 -7165,7 +7173,7 @@@ F: arch/arm/mach-s3c2410/bast-irq. TI DAVINCI MACHINE SUPPORT M: Sekhar Nori - M: Kevin Hilman + M: Kevin Hilman L: davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers) T: git git://gitorious.org/linux-davinci/linux-davinci.git Q: http://patchwork.kernel.org/project/linux-davinci/list/ @@@ -7206,6 -7198,13 +7206,6 @@@ L: netdev@vger.kernel.or S: Maintained F: drivers/net/ethernet/sis/sis900.* -SIS 96X I2C/SMBUS DRIVER -M: "Mark M. Hoffman" -L: linux-i2c@vger.kernel.org -S: Maintained -F: Documentation/i2c/busses/i2c-sis96x -F: drivers/i2c/busses/i2c-sis96x.c - SIS FRAMEBUFFER DRIVER M: Thomas Winischhofer W: http://www.winischhofer.net/linuxsisvga.shtml @@@ -7283,7 -7282,7 +7283,7 @@@ F: Documentation/hwmon/sch562 F: drivers/hwmon/sch5627.c SMSC47B397 HARDWARE MONITOR DRIVER -M: "Mark M. Hoffman" +M: Jean Delvare L: lm-sensors@lm-sensors.org S: Maintained F: Documentation/hwmon/smsc47b397