From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Nov 2010 22:42:03 +0000 (+0900)
Subject: Merge branch 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=47143b094d4700842e42b0a7cc2548d7ae292690;hp=-c;p=linux-beck.git

Merge branch 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

* 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  pci root complex: support for tile architecture
  drivers/net/tile/: on-chip network drivers for the tile architecture
  MAINTAINERS: add drivers/char/hvc_tile.c as maintained by tile
---

47143b094d4700842e42b0a7cc2548d7ae292690
diff --combined MAINTAINERS
index 98fc0450d7e1,70b3820aa58e..b3be8b3d0437
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -161,7 -161,7 +161,7 @@@ M:	Greg Kroah-Hartman <gregkh@suse.de
  L:	linux-serial@vger.kernel.org
  W:	http://serial.sourceforge.net
  S:	Maintained
 -T:	quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
  F:	drivers/serial/8250*
  F:	include/linux/serial_8250.h
  
@@@ -945,7 -945,7 +945,7 @@@ M:	Magnus Damm <magnus.damm@gmail.com
  L:	linux-sh@vger.kernel.org
  W:	http://oss.renesas.com
  Q:	http://patchwork.kernel.org/project/linux-sh/list/
 -T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git
 +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git rmobile-latest
  S:	Supported
  F:	arch/arm/mach-shmobile/
  F:	drivers/sh/
@@@ -1359,7 -1359,7 +1359,7 @@@ F:	include/net/bluetooth
  
  BONDING DRIVER
  M:	Jay Vosburgh <fubar@us.ibm.com>
 -L:	bonding-devel@lists.sourceforge.net
 +L:	netdev@vger.kernel.org
  W:	http://sourceforge.net/projects/bonding/
  S:	Supported
  F:	drivers/net/bonding/
@@@ -1829,13 -1829,6 +1829,13 @@@ W:	http://www.chelsio.co
  S:	Supported
  F:	drivers/net/cxgb4vf/
  
 +STMMAC ETHERNET DRIVER
 +M:	Giuseppe Cavallaro <peppe.cavallaro@st.com>
 +L:	netdev@vger.kernel.org
 +W:	http://www.stlinux.com
 +S:	Supported
 +F:	drivers/net/stmmac/
 +
  CYBERPRO FB DRIVER
  M:	Russell King <linux@arm.linux.org.uk>
  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -2015,7 -2008,6 +2015,7 @@@ F:	drivers/hwmon/dme1737.
  DOCBOOK FOR DOCUMENTATION
  M:	Randy Dunlap <rdunlap@xenotime.net>
  S:	Maintained
 +F:	scripts/kernel-doc
  
  DOCKING STATION DRIVER
  M:	Shaohua Li <shaohua.li@intel.com>
@@@ -2026,7 -2018,6 +2026,7 @@@ F:	drivers/acpi/dock.
  DOCUMENTATION
  M:	Randy Dunlap <rdunlap@xenotime.net>
  L:	linux-doc@vger.kernel.org
 +T:	quilt oss.oracle.com/~rdunlap/kernel-doc-patches/current/
  S:	Maintained
  F:	Documentation/
  
@@@ -2444,12 -2435,9 +2444,12 @@@ F:	drivers/net/wan/sdla.
  FRAMEBUFFER LAYER
  L:	linux-fbdev@vger.kernel.org
  W:	http://linux-fbdev.sourceforge.net/
 +Q:	http://patchwork.kernel.org/project/linux-fbdev/list/
 +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git
  S:	Orphan
  F:	Documentation/fb/
 -F:	drivers/video/fb*
 +F:	drivers/video/
 +F:	include/video/
  F:	include/linux/fb.h
  
  FREESCALE DMA DRIVER
@@@ -5688,7 -5676,7 +5688,7 @@@ S:	Maintaine
  
  STAGING SUBSYSTEM
  M:	Greg Kroah-Hartman <gregkh@suse.de>
 -T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6.git
 +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git
  L:	devel@driverdev.osuosl.org
  S:	Maintained
  F:	drivers/staging/
@@@ -5717,7 -5705,7 +5717,7 @@@ M:	Paul Mundt <lethal@linux-sh.org
  L:	linux-sh@vger.kernel.org
  W:	http://www.linux-sh.org
  Q:	http://patchwork.kernel.org/project/linux-sh/list/
 -T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git
 +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git sh-latest
  S:	Supported
  F:	Documentation/sh/
  F:	arch/sh/
@@@ -5839,6 -5827,8 +5839,8 @@@ M:	Chris Metcalf <cmetcalf@tilera.com
  W:	http://www.tilera.com/scm/
  S:	Supported
  F:	arch/tile/
+ F:	drivers/char/hvc_tile.c
+ F:	drivers/net/tile/
  
  TLAN NETWORK DRIVER
  M:	Samuel Chessman <chessman@tux.org>
@@@ -5922,7 -5912,7 +5924,7 @@@ S:	Maintaine
  TTY LAYER
  M:	Greg Kroah-Hartman <gregkh@suse.de>
  S:	Maintained
 -T:	quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
  F:	drivers/char/tty_*
  F:	drivers/serial/serial_core.c
  F:	include/linux/serial_core.h
@@@ -6245,7 -6235,7 +6247,7 @@@ USB SUBSYSTE
  M:	Greg Kroah-Hartman <gregkh@suse.de>
  L:	linux-usb@vger.kernel.org
  W:	http://www.linux-usb.org
 -T:	quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git
  S:	Supported
  F:	Documentation/usb/
  F:	drivers/net/usb/
@@@ -6610,14 -6600,14 +6612,14 @@@ F:	drivers/platform/x8
  
  XEN PCI SUBSYSTEM
  M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 -L:	xen-devel@lists.xensource.com
 +L:	xen-devel@lists.xensource.com (moderated for non-subscribers)
  S:	Supported
  F:	arch/x86/pci/*xen*
  F:	drivers/pci/*xen*
  
  XEN SWIOTLB SUBSYSTEM
  M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 -L:	xen-devel@lists.xensource.com
 +L:	xen-devel@lists.xensource.com (moderated for non-subscribers)
  S:	Supported
  F:	arch/x86/xen/*swiotlb*
  F:	drivers/xen/*swiotlb*
@@@ -6625,7 -6615,7 +6627,7 @@@
  XEN HYPERVISOR INTERFACE
  M:	Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
  M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 -L:	xen-devel@lists.xen.org
 +L:	xen-devel@lists.xensource.com (moderated for non-subscribers)
  L:	virtualization@lists.osdl.org
  S:	Supported
  F:	arch/x86/xen/