From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Mar 2013 19:32:14 +0000 (-0700)
Subject: Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa... 
X-Git-Tag: v3.9-rc4~4
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/df2a8f39cdecdf59be797b9c86b26f90b37321e7?hp=-c

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang:
 "One bugfix for the tegra driver.  Two updates regarding email
  addresses and MAINTAINERS which I like to have up-to-date so people
  can be reached immediately.  While we are here, there is on PCI_ID
  addition."

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  MAINTAINERS: add maintainer entry for atmel i2c driver
  i2c: Fix my e-mail address in drivers and documentation
  i2c: iSMT: add Intel Avoton DeviceIDs
  i2c: tegra: check the clk_prepare_enable() return value
---

df2a8f39cdecdf59be797b9c86b26f90b37321e7
diff --combined MAINTAINERS
index 25e3bd54d94a,23fa78bb6253..4cf5fd334a06
--- 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" <mhoffman@lightlink.com>
 -L:	lm-sensors@lm-sensors.org
 -S:	Maintained
 -F:	drivers/hwmon/asb100.c
 -
  ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
  M:	Dan Williams <djbw@fb.com>
  W:	http://sourceforge.net/projects/xscaleiop
@@@ -1461,6 -1467,12 +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 <ludovic.desroches@atmel.com>
+ L:	linux-i2c@vger.kernel.org
+ S:	Supported
+ F:	drivers/i2c/busses/i2c-at91.c
+ 
  ATMEL ISI DRIVER
  M:	Josh Wu <josh.wu@atmel.com>
  L:	linux-media@vger.kernel.org
@@@ -2623,7 -2635,7 +2629,7 @@@ F:	include/uapi/drm
  
  INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
  M:	Daniel Vetter <daniel.vetter@ffwll.ch>
 -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
@@@ -3845,7 -3857,7 +3851,7 @@@ F:	drivers/i2c/busses/i2c-ismt.
  F:	Documentation/i2c/busses/i2c-ismt
  
  I2C/SMBUS STUB DRIVER
 -M:	"Mark M. Hoffman" <mhoffman@lightlink.com>
 +M:	Jean Delvare <khali@linux-fr.org>
  L:	linux-i2c@vger.kernel.org
  S:	Maintained
  F:	drivers/i2c/i2c-stub.c
@@@ -5641,14 -5653,6 +5647,14 @@@ S:	Maintaine
  F:	drivers/video/riva/
  F:	drivers/video/nvidia/
  
 +NVM EXPRESS DRIVER
 +M:	Matthew Wilcox <willy@linux.intel.com>
 +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 <tony@atomide.com>
  L:	linux-omap@vger.kernel.org
@@@ -7200,6 -7204,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" <mhoffman@lightlink.com>
 -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 <thomas@winischhofer.net>
  W:	http://www.winischhofer.net/linuxsisvga.shtml
@@@ -7277,7 -7288,7 +7283,7 @@@ F:	Documentation/hwmon/sch562
  F:	drivers/hwmon/sch5627.c
  
  SMSC47B397 HARDWARE MONITOR DRIVER
 -M:	"Mark M. Hoffman" <mhoffman@lightlink.com>
 +M:	Jean Delvare <khali@linux-fr.org>
  L:	lm-sensors@lm-sensors.org
  S:	Maintained
  F:	Documentation/hwmon/smsc47b397