]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge commit 'v2.6.37-rc5' into perf/core
authorIngo Molnar <mingo@elte.hu>
Tue, 7 Dec 2010 06:49:48 +0000 (07:49 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 7 Dec 2010 06:49:51 +0000 (07:49 +0100)
Merge reason: Pick up the latest -rc.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
MAINTAINERS

diff --combined MAINTAINERS
index 96e1a833e443ca3bf4ca3d29a2960cb0ec15d18d,1a1c27b9c557b2e07af18cb9b8c4e97c53c95c86..ed192f11ad2309915057c1e16799449befa5b9f6
@@@ -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/
@@@ -2060,7 -2060,7 +2060,7 @@@ F:      Documentation/blockdev/drbd
  
  DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
  M:    Greg Kroah-Hartman <gregkh@suse.de>
- T:    quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git
  S:    Supported
  F:    Documentation/kobject.txt
  F:    drivers/base/
@@@ -2080,7 -2080,7 +2080,7 @@@ F:      include/drm
  
  INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
  M:    Chris Wilson <chris@chris-wilson.co.uk>
- L:    intel-gfx@lists.freedesktop.org
+ L:    intel-gfx@lists.freedesktop.org (subscribers-only)
  L:    dri-devel@lists.freedesktop.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel.git
  S:    Supported
@@@ -2444,10 -2444,12 +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
@@@ -4062,9 -4064,8 +4064,8 @@@ F:      drivers/scsi/NCR_D700.
  
  NETEFFECT IWARP RNIC DRIVER (IW_NES)
  M:    Faisal Latif <faisal.latif@intel.com>
- M:    Chien Tung <chien.tin.tung@intel.com>
  L:    linux-rdma@vger.kernel.org
- W:    http://www.neteffect.com
+ W:    http://www.intel.com/Products/Server/Adapters/Server-Cluster/Server-Cluster-overview.htm
  S:    Supported
  F:    drivers/infiniband/hw/nes/
  
@@@ -4611,7 -4612,7 +4612,7 @@@ PERFORMANCE EVENTS SUBSYSTE
  M:    Peter Zijlstra <a.p.zijlstra@chello.nl>
  M:    Paul Mackerras <paulus@samba.org>
  M:    Ingo Molnar <mingo@elte.hu>
 -M:    Arnaldo Carvalho de Melo <acme@redhat.com>
 +M:    Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
  S:    Supported
  F:    kernel/perf_event*.c
  F:    include/linux/perf_event.h
@@@ -5837,6 -5838,8 +5838,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>