Merge branch 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block into for-2.6.33

diff --combined MAINTAINERS
index 8824115,5a7ba81..ab095be
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -577,11 -577,6 +577,11 @@@ M:       Mike Rapoport <mike@compulab.co.il
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
 +ARM/CONTEC MICRO9 MACHINE SUPPORT
 +M:    Hubert Feurstein <hubert.feurstein@contec.at>
 +S:    Maintained
 +F:    arch/arm/mach-ep93xx/micro9.c
 +
  ARM/CORGI MACHINE SUPPORT
  M:    Richard Purdie <rpurdie@rpsys.net>
  S:    Maintained
@@@ -1236,13 -1231,6 +1236,13 @@@ L:    netdev@vger.kernel.or
  S:    Supported
  F:    drivers/net/tg3.*
  
 +BROCADE BFA FC SCSI DRIVER
 +P:      Jing Huang
 +M:      huangj@brocade.com
 +L:      linux-scsi@vger.kernel.org
 +S:      Supported
 +F:      drivers/scsi/bfa/
 +
  BSG (block layer generic sg v4 driver)
  M:    FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
  L:    linux-scsi@vger.kernel.org
@@@ -1790,6 -1778,19 +1790,19 @@@ S:    Maintaine
  F:    drivers/scsi/dpt*
  F:    drivers/scsi/dpt/
  
+ DRBD DRIVER
+ P:     Philipp Reisner
+ P:     Lars Ellenberg
+ M:     drbd-dev@lists.linbit.com
+ L:     drbd-user@lists.linbit.com
+ W:     http://www.drbd.org
+ T:     git git://git.drbd.org/linux-2.6-drbd.git drbd
+ T:     git git://git.drbd.org/drbd-8.3.git
+ S:     Supported
+ F:     drivers/block/drbd/
+ F:     lib/lru_cache.c
+ F:     Documentation/blockdev/drbd/
+ 
  DRIVER CORE, KOBJECTS, AND SYSFS
  M:    Greg Kroah-Hartman <gregkh@suse.de>
  T:    quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
@@@ -2070,7 -2071,7 +2083,7 @@@ S:      Maintaine
  F:    fs/*
  
  FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
 -M:    Riku Voipio <riku.vipio@iki.fi>
 +M:    Riku Voipio <riku.voipio@iki.fi>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    drivers/hwmon/f75375s.c
@@@ -2615,7 -2616,6 +2628,7 @@@ L:      linux1394-devel@lists.sourceforge.ne
  W:    http://www.linux1394.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
  S:    Maintained
 +F:    Documentation/debugging-via-ohci1394.txt
  F:    drivers/ieee1394/
  
  IEEE 1394 RAW I/O DRIVER
@@@ -3656,18 -3656,10 +3669,18 @@@ F:   Documentation/blockdev/nbd.tx
  F:    drivers/block/nbd.c
  F:    include/linux/nbd.h
  
 +NETWORK DROP MONITOR
 +M:    Neil Horman <nhorman@tuxdriver.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +W:    https://fedorahosted.org/dropwatch/
 +F:    net/core/drop_monitor.c
 +
  NETWORKING [GENERAL]
  M:    "David S. Miller" <davem@davemloft.net>
  L:    netdev@vger.kernel.org
  W:    http://www.linuxfoundation.org/en/Net
 +W:    http://patchwork.ozlabs.org/project/netdev/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
  S:    Maintained
  F:    net/
@@@ -3994,7 -3986,6 +4007,7 @@@ F:      drivers/block/paride
  PARISC ARCHITECTURE
  M:    Kyle McMartin <kyle@mcmartin.ca>
  M:    Helge Deller <deller@gmx.de>
 +M:    "James E.J. Bottomley" <jejb@parisc-linux.org>
  L:    linux-parisc@vger.kernel.org
  W:    http://www.parisc-linux.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
@@@ -4078,13 -4069,6 +4091,13 @@@ M:    Peter Zijlstra <a.p.zijlstra@chello.
  M:    Paul Mackerras <paulus@samba.org>
  M:    Ingo Molnar <mingo@elte.hu>
  S:    Supported
 +F:    kernel/perf_event.c
 +F:    include/linux/perf_event.h
 +F:    arch/*/*/kernel/perf_event.c
 +F:    arch/*/include/asm/perf_event.h
 +F:    arch/*/lib/perf_event.c
 +F:    arch/*/kernel/perf_callchain.c
 +F:    tools/perf/
  
  PERSONALITY HANDLING
  M:    Christoph Hellwig <hch@infradead.org>
@@@ -4667,14 -4651,6 +4680,14 @@@ F:    drivers/ata
  F:    include/linux/ata.h
  F:    include/linux/libata.h
  
 +SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
 +P:     Jayamohan Kallickal
 +M:     jayamohank@serverengines.com
 +L:     linux-scsi@vger.kernel.org
 +W:     http://www.serverengines.com
 +S:     Supported
 +F:     drivers/scsi/be2iscsi/
 +
  SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER
  M:    Sathya Perla <sathyap@serverengines.com>
  M:    Subbu Seetharaman <subbus@serverengines.com>
@@@ -5665,13 -5641,6 +5678,13 @@@ S:    Maintaine
  F:    drivers/vlynq/vlynq.c
  F:    include/linux/vlynq.h
  
 +VMWARE VMXNET3 ETHERNET DRIVER
 +M:     Shreyas Bhatewara <sbhatewara@vmware.com>
 +M:     VMware, Inc. <pv-drivers@vmware.com>
 +L:     netdev@vger.kernel.org
 +S:     Maintained
 +F:     drivers/net/vmxnet3/
 +
  VOLTAGE AND CURRENT REGULATOR FRAMEWORK
  M:    Liam Girdwood <lrg@slimlogic.co.uk>
  M:    Mark Brown <broonie@opensource.wolfsonmicro.com>