Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

* 'linux-next' of git://git.infradead.org/ubifs-2.6: (32 commits)
  MAINTAINERS: change e-mail of Adrian Hunter
  UBIFS: fix master node recovery
  UBIFS: improve power cut emulation testing
  UBIFS: rename recovery testing variables
  UBIFS: remove custom list of superblocks
  UBIFS: stop re-defining UBI operations
  UBIFS: switch to I/O helpers
  UBIFS: switch to ubifs_leb_write
  UBIFS: switch to ubifs_leb_read
  UBIFS: introduce more I/O helpers
  UBIFS: always print stacktrace when switching to R/O mode
  UBIFS: remove unused and unneeded debugging function
  UBIFS: add global debugfs knobs
  UBIFS: introduce debugfs helpers
  UBIFS: re-arrange debugging code a bit
  UBIFS: be more informative in failure mode
  UBIFS: switch self-check knobs to debugfs
  UBIFS: lessen amount of debugging check types
  UBIFS: introduce helper functions for debugging checks and tests
  UBIFS: amend debugging inode size check function prototype
  ...

diff --combined MAINTAINERS
index 187282d,63cd1d5..72b979d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1,4 -1,5 +1,5 @@@
  
+ 
        List of maintainers and how to submit kernel changes
  
  Please try to follow the guidelines below.  This will make things
@@@ -594,16 -595,6 +595,16 @@@ S:       Maintaine
  F:    arch/arm/lib/floppydma.S
  F:    arch/arm/include/asm/floppy.h
  
 +ARM PMU PROFILING AND DEBUGGING
 +M:    Will Deacon <will.deacon@arm.com>
 +S:    Maintained
 +F:    arch/arm/kernel/perf_event*
 +F:    arch/arm/oprofile/common.c
 +F:    arch/arm/kernel/pmu.c
 +F:    arch/arm/include/asm/pmu.h
 +F:    arch/arm/kernel/hw_breakpoint.c
 +F:    arch/arm/include/asm/hw_breakpoint.h
 +
  ARM PORT
  M:    Russell King <linux@arm.linux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1355,18 -1346,16 +1356,18 @@@ F:   drivers/auxdisplay
  F:    include/linux/cfag12864b.h
  
  AVR32 ARCHITECTURE
 -M:    Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
 +M:    Haavard Skinnemoen <hskinnemoen@gmail.com>
 +M:    Hans-Christian Egtvedt <egtvedt@samfundet.no>
  W:    http://www.atmel.com/products/AVR32/
  W:    http://avr32linux.org/
  W:    http://avrfreaks.net/
 -S:    Supported
 +S:    Maintained
  F:    arch/avr32/
  
  AVR32/AT32AP MACHINE SUPPORT
 -M:    Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
 -S:    Supported
 +M:    Haavard Skinnemoen <hskinnemoen@gmail.com>
 +M:    Hans-Christian Egtvedt <egtvedt@samfundet.no>
 +S:    Maintained
  F:    arch/avr32/mach-at32ap/
  
  AX.25 NETWORK LAYER
@@@ -1402,6 -1391,7 +1403,6 @@@ F:      include/linux/backlight.
  BATMAN ADVANCED
  M:    Marek Lindner <lindner_marek@yahoo.de>
  M:    Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
 -M:    Sven Eckelmann <sven@narfation.org>
  L:    b.a.t.m.a.n@lists.open-mesh.org
  W:    http://www.open-mesh.org/
  S:    Maintained
@@@ -1434,6 -1424,7 +1435,6 @@@ S:      Supporte
  F:    arch/blackfin/
  
  BLACKFIN EMAC DRIVER
 -M:    Michael Hennerich <michael.hennerich@analog.com>
  L:    uclinux-dist-devel@blackfin.uclinux.org
  W:    http://blackfin.uclinux.org
  S:    Supported
@@@ -1649,7 -1640,7 +1650,7 @@@ CAN NETWORK LAYE
  M:    Oliver Hartkopp <socketcan@hartkopp.net>
  M:    Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
  M:    Urs Thuermann <urs.thuermann@volkswagen.de>
 -L:    socketcan-core@lists.berlios.de
 +L:    socketcan-core@lists.berlios.de (subscribers-only)
  L:    netdev@vger.kernel.org
  W:    http://developer.berlios.de/projects/socketcan/
  S:    Maintained
@@@ -1661,7 -1652,7 +1662,7 @@@ F:      include/linux/can/raw.
  
  CAN NETWORK DRIVERS
  M:    Wolfgang Grandegger <wg@grandegger.com>
 -L:    socketcan-core@lists.berlios.de
 +L:    socketcan-core@lists.berlios.de (subscribers-only)
  L:    netdev@vger.kernel.org
  W:    http://developer.berlios.de/projects/socketcan/
  S:    Maintained
@@@ -2207,7 -2198,7 +2208,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/
 +T:    quilt http://userweb.kernel.org/~rdunlap/kernel-doc-patches/current/
  S:    Maintained
  F:    Documentation/
  
@@@ -4992,7 -4983,7 +4993,7 @@@ F:      drivers/power/power_supply
  
  PNP SUPPORT
  M:    Adam Belay <abelay@mit.edu>
 -M:    Bjorn Helgaas <bjorn.helgaas@hp.com>
 +M:    Bjorn Helgaas <bhelgaas@google.com>
  S:    Maintained
  F:    drivers/pnp/
  
@@@ -5191,7 -5182,6 +5192,7 @@@ S:      Supporte
  F:    drivers/net/qlcnic/
  
  QLOGIC QLGE 10Gb ETHERNET DRIVER
 +M:    Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
  M:    Ron Mercer <ron.mercer@qlogic.com>
  M:    linux-driver@qlogic.com
  L:    netdev@vger.kernel.org
@@@ -6321,7 -6311,7 +6322,7 @@@ F:      drivers/scsi/u14-34f.
  
  UBI FILE SYSTEM (UBIFS)
  M:    Artem Bityutskiy <dedekind1@gmail.com>
- M:    Adrian Hunter <adrian.hunter@nokia.com>
+ M:    Adrian Hunter <adrian.hunter@intel.com>
  L:    linux-mtd@lists.infradead.org
  T:    git git://git.infradead.org/ubifs-2.6.git
  W:    http://www.linux-mtd.infradead.org/doc/ubifs.html
@@@ -6445,9 -6435,8 +6446,9 @@@ S:      Maintaine
  F:    drivers/usb/misc/rio500*
  
  USB EHCI DRIVER
 +M:    Alan Stern <stern@rowland.harvard.edu>
  L:    linux-usb@vger.kernel.org
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/usb/ehci.txt
  F:    drivers/usb/host/ehci*
  
@@@ -6477,12 -6466,6 +6478,12 @@@ S:    Maintaine
  F:    Documentation/hid/hiddev.txt
  F:    drivers/hid/usbhid/
  
 +USB/IP DRIVERS
 +M:    Matt Mooney <mfm@muteddisk.com>
 +L:    linux-usb@vger.kernel.org
 +S:    Maintained
 +F:    drivers/staging/usbip/
 +
  USB ISP116X DRIVER
  M:    Olav Kongas <ok@artecdesign.ee>
  L:    linux-usb@vger.kernel.org
@@@ -6512,9 -6495,8 +6513,9 @@@ S:      Maintaine
  F:    sound/usb/midi.*
  
  USB OHCI DRIVER
 +M:    Alan Stern <stern@rowland.harvard.edu>
  L:    linux-usb@vger.kernel.org
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/usb/ohci.txt
  F:    drivers/usb/host/ohci*
  
@@@ -6743,7 -6725,6 +6744,7 @@@ F:      fs/fat
  VIDEOBUF2 FRAMEWORK
  M:    Pawel Osciak <pawel@osciak.com>
  M:    Marek Szyprowski <m.szyprowski@samsung.com>
 +M:    Kyungmin Park <kyungmin.park@samsung.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    drivers/media/video/videobuf2-*