Merge git://git.infradead.org/ubifs-2.6

* git://git.infradead.org/ubifs-2.6:
  UBIFS: fix return code in check_leaf
  UBI: flush wl before clearing update marker
  MAINTAINERS: change e-mail of Artem Bityutskiy
  UBIFS: remove manual O_SYNC handling
  UBIFS: support mounting of UBI volume character devices
  UBI: Add ubi_open_volume_path

diff --combined MAINTAINERS
index 746b706206da70d40f62a6998f387cdfdf182a2f,8a158e1a9c4c1c7e16e6d1019d4420dc0b709b3e..d7f8668b7a726be9d3c9ac61d5c6eda05370bc58
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -327,13 -327,6 +327,13 @@@ M:       Colin Leroy <colin@colino.net
  S:    Maintained
  F:    drivers/macintosh/therm_adt746x.c
  
 +ADT7475 HARDWARE MONITOR DRIVER
 +M:    Jean Delvare <khali@linux-fr.org>
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +F:    Documentation/hwmon/adt7475
 +F:    drivers/hwmon/adt7475.c
 +
  ADVANSYS SCSI DRIVER
  M:    Matthew Wilcox <matthew@wil.cx>
  L:    linux-scsi@vger.kernel.org
@@@ -493,6 -486,13 +493,6 @@@ S:        Maintaine
  F:    drivers/net/appletalk/
  F:    net/appletalk/
  
 -APPLETOUCH TOUCHPAD DRIVER
 -M:    Johannes Berg <johannes@sipsolutions.net>
 -L:    linux-input@vger.kernel.org
 -S:    Maintained
 -F:    Documentation/input/appletouch.txt
 -F:    drivers/input/mouse/appletouch.c
 -
  ARC FRAMEBUFFER DRIVER
  M:    Jaya Kumar <jayalk@intworks.biz>
  S:    Maintained
@@@ -512,32 -512,10 +512,32 @@@ W:      http://www.arm.linux.org.uk
  S:    Maintained
  F:    arch/arm/
  
 +ARM PRIMECELL AACI PL041 DRIVER
 +M:    Russell King <linux@arm.linux.org.uk>
 +S:    Maintained
 +F:    sound/arm/aaci.*
 +
 +ARM PRIMECELL CLCD PL110 DRIVER
 +M:    Russell King <linux@arm.linux.org.uk>
 +S:    Maintained
 +F:    drivers/video/amba-clcd.*
 +
 +ARM PRIMECELL KMI PL050 DRIVER
 +M:    Russell King <linux@arm.linux.org.uk>
 +S:    Maintained
 +F:    drivers/input/serio/ambakmi.*
 +F:    include/linux/amba/kmi.h
 +
  ARM PRIMECELL MMCI PL180/1 DRIVER
  S:    Orphan
  F:    drivers/mmc/host/mmci.*
  
 +ARM PRIMECELL BUS SUPPORT
 +M:    Russell King <linux@arm.linux.org.uk>
 +S:    Maintained
 +F:    drivers/amba/
 +F:    include/linux/amba/bus.h
 +
  ARM/ADI ROADRUNNER MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -659,9 -637,6 +659,9 @@@ ARM/FREESCALE IMX / MXC ARM ARCHITECTUR
  M:    Sascha Hauer <kernel@pengutronix.de>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 +T:    git://git.pengutronix.de/git/imx/linux-2.6.git
 +F:    arch/arm/mach-mx*/
 +F:    arch/arm/plat-mxc/
  
  ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
@@@ -732,19 -707,6 +732,19 @@@ L:       linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    arch/arm/mach-ixp4xx/
  
 +ARM/INTEL RESEARCH IMOTE 2 MACHINE SUPPORT
 +M:    Jonathan Cameron <jic23@cam.ac.uk>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-pxa/imote2.c
 +
 +ARM/INTEL RESEARCH STARGATE 2 MACHINE SUPPORT
 +M:    Jonathan Cameron <jic23@cam.ac.uk>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-pxa/stargate2.c
 +F:    drivers/pcmcia/pxa2xx_stargate2.c
 +
  ARM/INTEL XSC3 (MANZANO) ARM CORE
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  M:    Dan Williams <dan.j.williams@intel.com>
@@@ -787,14 -749,6 +787,14 @@@ ARM/NEC MOBILEPRO 900/c MACHINE SUPPOR
  M:    Michael Petchkovsky <mkpetch@internode.on.net>
  S:    Maintained
  
 +ARM/NOMADIK ARCHITECTURE
 +M:     Alessandro Rubini <rubini@unipv.it>
 +M:     STEricsson <STEricsson_nomadik_linux@list.st.com>
 +L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:     Maintained
 +F:     arch/arm/mach-nomadik/
 +F:     arch/arm/plat-nomadik/
 +
  ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
  M:    Nelson Castillo <arhuaco@freaks-unidos.net>
  L:    openmoko-kernel@lists.openmoko.org (subscribers-only)
@@@ -939,12 -893,6 +939,12 @@@ L:       linux-arm-kernel@lists.infradead.or
  W:    http://www.mcuos.com
  S:    Maintained
  
 +ARM/U8500 ARM ARCHITECTURE
 +M:    Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-ux500/
 +
  ARM/VFP SUPPORT
  M:    Russell King <linux@arm.linux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1079,7 -1027,7 +1079,7 @@@ F:      drivers/serial/atmel_serial.
  
  ATMEL LCDFB DRIVER
  M:    Nicolas Ferre <nicolas.ferre@atmel.com>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/atmel_lcdfb.c
  F:    include/video/atmel_lcdc.h
@@@ -1150,6 -1098,7 +1150,6 @@@ F:      include/net/ax25.
  F:    net/ax25/
  
  B43 WIRELESS DRIVER
 -M:    Michael Buesch <mb@bu3sch.de>
  M:    Stefano Brivio <stefano.brivio@polimi.it>
  L:    linux-wireless@vger.kernel.org
  W:    http://linuxwireless.org/en/users/Drivers/b43
@@@ -1848,19 -1797,6 +1848,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/
@@@ -2177,7 -2113,7 +2177,7 @@@ F:      drivers/net/wan/dlci.
  F:    drivers/net/wan/sdla.c
  
  FRAMEBUFFER LAYER
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  W:    http://linux-fbdev.sourceforge.net/
  S:    Orphan
  F:    Documentation/fb/
@@@ -2200,7 -2136,7 +2200,7 @@@ F:      drivers/i2c/busses/i2c-cpm.
  
  FREESCALE IMX / MXC FRAMEBUFFER DRIVER
  M:    Sascha Hauer <kernel@pengutronix.de>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/plat-mxc/include/mach/imxfb.h
@@@ -2376,13 -2312,6 +2376,13 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/media/video/gspca/finepix.c
  
 +GSPCA GL860 SUBDRIVER
 +M:    Olivier Lorin <o.lorin@laposte.net>
 +L:    linux-media@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +S:    Maintained
 +F:    drivers/media/video/gspca/gl860/
 +
  GSPCA M5602 SUBDRIVER
  M:    Erik Andren <erik.andren@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -2423,9 -2352,7 +2423,9 @@@ HARDWARE MONITORIN
  L:    lm-sensors@lm-sensors.org
  W:    http://www.lm-sensors.org/
  S:    Orphan
 +F:    Documentation/hwmon/
  F:    drivers/hwmon/
 +F:    include/linux/hwmon*.h
  
  HARDWARE RANDOM NUMBER GENERATOR CORE
  M:    Matt Mackall <mpm@selenic.com>
@@@ -2606,7 -2533,8 +2606,7 @@@ S:      Maintaine
  F:    Documentation/i2c/
  F:    drivers/i2c/
  F:    include/linux/i2c.h
 -F:    include/linux/i2c-dev.h
 -F:    include/linux/i2c-id.h
 +F:    include/linux/i2c-*.h
  
  I2C-TINY-USB DRIVER
  M:    Till Harbaum <till@harbaum.org>
@@@ -2707,7 -2635,7 +2707,7 @@@ S:      Supporte
  F:    security/integrity/ima/
  
  IMS TWINTURBO FRAMEBUFFER DRIVER
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  S:    Orphan
  F:    drivers/video/imsttfb.c
  
@@@ -2742,14 -2670,14 +2742,14 @@@ F:   drivers/input
  
  INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
  M:    Sylvain Meyer <sylvain.meyer@worldonline.fr>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    Documentation/fb/intelfb.txt
  F:    drivers/video/intelfb/
  
  INTEL 810/815 FRAMEBUFFER DRIVER
  M:    Antonino Daplas <adaplas@gmail.com>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/i810/
  
@@@ -2861,15 -2789,6 +2861,15 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/net/wireless/iwlwifi/
  
 +INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi)
 +M:    Samuel Ortiz <samuel.ortiz@intel.com>
 +M:    Zhu Yi <yi.zhu@intel.com>
 +M:    Intel Linux Wireless <ilw@linux.intel.com>
 +L:    linux-wireless@vger.kernel.org
 +S:    Supported
 +W:    http://wireless.kernel.org/en/users/Drivers/iwmc3200wifi
 +F:    drivers/net/wireless/iwmc3200wifi/
 +
  IOC3 ETHERNET DRIVER
  M:    Ralf Baechle <ralf@linux-mips.org>
  L:    linux-mips@linux-mips.org
@@@ -3068,8 -2987,11 +3068,8 @@@ S:     Maintaine
  F:    fs/autofs4/
  
  KERNEL BUILD
 -M:    Sam Ravnborg <sam@ravnborg.org>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git
  L:    linux-kbuild@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/kbuild/
  F:    Makefile
  F:    scripts/Makefile.*
@@@ -3141,7 -3063,6 +3141,7 @@@ S:      Supporte
  F:    Documentation/s390/kvm.txt
  F:    arch/s390/include/asm/kvm*
  F:    arch/s390/kvm/
 +F:    drivers/s390/kvm/
  
  KEXEC
  M:    Eric Biederman <ebiederm@xmission.com>
@@@ -3321,12 -3242,6 +3321,12 @@@ S:    Maintaine
  F:    Documentation/hwmon/lis3lv02d
  F:    drivers/hwmon/lis3lv02d.*
  
 +LM73 HARDWARE MONITOR DRIVER
 +M:    Guillaume Ligneul <guillaume.ligneul@gmail.com>
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +F:    drivers/hwmon/lm73.c
 +
  LM83 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <khali@linux-fr.org>
  L:    lm-sensors@lm-sensors.org
@@@ -3476,7 -3391,7 +3476,7 @@@ S:      Supporte
  
  MATROX FRAMEBUFFER DRIVER
  M:    Petr Vandrovec <vandrove@vc.cvut.cz>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/matrox/matroxfb_*
  F:    include/linux/matroxfb.h
@@@ -3801,9 -3716,9 +3801,9 @@@ F:      include/linux/if_
  F:    include/linux/*device.h
  
  NETXEN (1/10) GbE SUPPORT
 -M:    Dhananjay Phadke <dhananjay@netxen.com>
 +M:    Amit Kumar Salecha <amit.salecha@qlogic.com>
  L:    netdev@vger.kernel.org
 -W:    http://www.netxen.com
 +W:    http://www.qlogic.com
  S:    Supported
  F:    drivers/net/netxen/
  
@@@ -3863,7 -3778,7 +3863,7 @@@ F:      fs/ntfs
  
  NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER
  M:    Antonino Daplas <adaplas@gmail.com>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/riva/
  F:    drivers/video/nvidia/
@@@ -3898,7 -3813,7 +3898,7 @@@ F:      sound/soc/omap
  
  OMAP FRAMEBUFFER SUPPORT
  M:    Imre Deak <imre.deak@nokia.com>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  L:    linux-omap@vger.kernel.org
  S:    Maintained
  F:    drivers/video/omap/
@@@ -4204,13 -4119,6 +4204,13 @@@ W:    http://www.pmc-sierra.com
  S:    Supported
  F:    drivers/scsi/pmcraid.*
  
 +PMC SIERRA PM8001 DRIVER
 +M:    jack_wang@usish.com
 +M:    lindar_liu@usish.com
 +L:    linux-scsi@vger.kernel.org
 +S:    Supported
 +F:    drivers/scsi/pm8001/
 +
  POSIX CLOCKS and TIMERS
  M:    Thomas Gleixner <tglx@linutronix.de>
  S:    Supported
@@@ -4411,14 -4319,14 +4411,14 @@@ F:   include/linux/qnxtypes.
  
  RADEON FRAMEBUFFER DISPLAY DRIVER
  M:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/aty/radeon*
  F:    include/linux/radeonfb.h
  
  RAGE128 FRAMEBUFFER DISPLAY DRIVER
  M:    Paul Mackerras <paulus@samba.org>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/aty/aty128fb.c
  
@@@ -4557,7 -4465,7 +4557,7 @@@ F:      drivers/net/wireless/rtl818x/rtl8187
  
  S3 SAVAGE FRAMEBUFFER DRIVER
  M:    Antonino Daplas <adaplas@gmail.com>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/savage/
  
@@@ -4569,7 -4477,6 +4569,7 @@@ L:      linux-s390@vger.kernel.or
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
  F:    arch/s390/
 +F:    drivers/s390/
  
  S390 NETWORK DRIVERS
  M:    Ursula Braun <ursula.braun@de.ibm.com>
@@@ -4585,7 -4492,6 +4585,7 @@@ M:      Felix Beck <felix.beck@de.ibm.com
  M:    Ralph Wuerthner <ralph.wuerthner@de.ibm.com>
  M:    linux390@de.ibm.com
  L:    linux-s390@vger.kernel.org
 +W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
  F:    drivers/s390/crypto/
  
@@@ -5335,7 -5241,7 +5335,7 @@@ S:      Maintaine
  F:    drivers/scsi/u14-34f.c
  
  UBI FILE SYSTEM (UBIFS)
- M:    Artem Bityutskiy <dedekind@infradead.org>
+ M:    Artem Bityutskiy <dedekind1@gmail.com>
  M:    Adrian Hunter <adrian.hunter@nokia.com>
  L:    linux-mtd@lists.infradead.org
  T:    git git://git.infradead.org/ubifs-2.6.git
@@@ -5386,7 -5292,7 +5386,7 @@@ F:      drivers/cdrom/cdrom.
  F:    include/linux/cdrom.h
  
  UNSORTED BLOCK IMAGES (UBI)
- M:    Artem Bityutskiy <dedekind@infradead.org>
+ M:    Artem Bityutskiy <dedekind1@gmail.com>
  W:    http://www.linux-mtd.infradead.org/
  L:    linux-mtd@lists.infradead.org
  T:    git git://git.infradead.org/ubi-2.6.git
@@@ -5722,7 -5628,7 +5722,7 @@@ S:      Maintaine
  
  UVESAFB DRIVER
  M:    Michal Januszewski <spock@gentoo.org>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  W:    http://dev.gentoo.org/~spock/projects/uvesafb/
  S:    Maintained
  F:    Documentation/fb/uvesafb.txt
@@@ -5755,7 -5661,7 +5755,7 @@@ F:      drivers/mmc/host/via-sdmmc.
  VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
  M:    Joseph Chan <JosephChan@via.com.tw>
  M:    Scott Fang <ScottFang@viatech.com.cn>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/via/
  
@@@ -5787,14 -5693,6 +5787,14 @@@ L:    netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/vmxnet3/
  
 +VMware PVSCSI driver
 +M:    Alok Kataria <akataria@vmware.com>
 +M:    VMware PV-Drivers <pv-drivers@vmware.com>
 +L:    linux-scsi@vger.kernel.org
 +S:    Maintained
 +F:    drivers/scsi/vmw_pvscsi.c
 +F:    drivers/scsi/vmw_pvscsi.h
 +
  VOLTAGE AND CURRENT REGULATOR FRAMEWORK
  M:    Liam Girdwood <lrg@slimlogic.co.uk>
  M:    Mark Brown <broonie@opensource.wolfsonmicro.com>