Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...

Fix fs/btrfs/super.c conflict around #includes

diff --combined MAINTAINERS
index d992d40,e1b7426..8a7b0b3
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -616,7 -616,7 +616,7 @@@ M: mkpetch@internode.on.ne
  S:    Maintained
  
  ARM/TOSA MACHINE SUPPORT
 -P:    Dmitry Baryshkov
 +P:    Dmitry Eremin-Solenikov
  M:    dbaryshkov@gmail.com
  P:    Dirk Opfer
  M:    dirk@opfer-online.de
@@@ -742,7 -742,7 +742,7 @@@ M: jirislaby@gmail.co
  P:    Nick Kossifidis
  M:    mickflemm@gmail.com
  P:    Luis R. Rodriguez
 -M:    mcgrof@gmail.com
 +M:    lrodriguez@atheros.com
  P:    Bob Copeland
  M:    me@bobcopeland.com
  L:    linux-wireless@vger.kernel.org
@@@ -1021,20 -1021,27 +1021,28 @@@ M:   mb@bu3sch.d
  W:    http://bu3sch.de/btgpio.php
  S:    Maintained
  
+ BTRFS FILE SYSTEM
+ P:    Chris Mason
+ M:    chris.mason@oracle.com
+ L:    linux-btrfs@vger.kernel.org
+ W:    http://btrfs.wiki.kernel.org/
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mason/btrfs-unstable.git
+ S:    Maintained
+ 
  BTTV VIDEO4LINUX DRIVER
  P:    Mauro Carvalho Chehab
  M:    mchehab@infradead.org
 -M:    v4l-dvb-maintainer@linuxtv.org
 +L:    linux-media@vger.kernel.org
  L:    video4linux-list@redhat.com
  W:    http://linuxtv.org
 -T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER
  P:    Jonathan Corbet
  M:    corbet@lwn.net
 -L:    video4linux-list@redhat.com
 +L:    linux-media@vger.kernel.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  CALGARY x86-64 IOMMU
@@@ -1093,8 -1100,11 +1101,8 @@@ S:     Maintaine
  
  CHECKPATCH
  P:    Andy Whitcroft
 -M:    apw@shadowen.org
 -P:    Randy Dunlap
 -M:    rdunlap@xenotime.net
 -P:    Joel Schopp
 -M:    jschopp@austin.ibm.com
 +M:    apw@canonical.com
 +L:    linux-kernel@vger.kernel.org
  S:    Supported
  
  CISCO 10G ETHERNET DRIVER
@@@ -1262,8 -1272,7 +1270,8 @@@ P:      Hans Verkuil, Andy Wall
  M:    hverkuil@xs4all.nl, awalls@radix.net
  L:    ivtv-devel@ivtvdriver.org
  L:    ivtv-users@ivtvdriver.org
 -L:    video4linux-list@redhat.com
 +L:    linux-media@vger.kernel.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  W:    http://linuxtv.org
  S:    Maintained
  
@@@ -1360,11 -1369,6 +1368,11 @@@ P:    Maciej W. Rozyck
  M:    macro@linux-mips.org
  S:    Maintained
  
 +DELL LAPTOP DRIVER
 +P:    Matthew Garrett
 +M:    mjg59@srcf.ucam.org
 +S:    Maintained
 +
  DELL LAPTOP SMM DRIVER
  P:    Massimo Dal Zotto
  M:    dz@debian.org
@@@ -1494,10 -1498,10 +1502,10 @@@ S:   Maintaine
  
  DVB SUBSYSTEM AND DRIVERS
  P:    LinuxTV.org Project
 -M:    v4l-dvb-maintainer@linuxtv.org
 +M:    linux-media@vger.kernel.org
  L:    linux-dvb@linuxtv.org (subscription required)
  W:    http://linuxtv.org/
 -T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  DZ DECSTATION DZ11 SERIAL DRIVER
@@@ -1581,13 -1585,6 +1589,13 @@@ L:    bluesmoke-devel@lists.sourceforge.ne
  W:    bluesmoke.sourceforge.net
  S:    Maintained
  
 +EDAC-I5400
 +P:    Mauro Carvalho Chehab
 +M:    mchehab@redhat.com
 +L:    bluesmoke-devel@lists.sourceforge.net
 +W:    bluesmoke.sourceforge.net
 +S:    Maintained
 +
  EDAC-I82975X
  P:    Ranganathan Desikan
  P:    Arvind R.
@@@ -1618,6 -1615,11 +1626,6 @@@ L:     acpi4asus-user@lists.sourceforge.ne
  W:    http://sourceforge.net/projects/acpi4asus
  S:    Maintained
  
 -EEPRO100 NETWORK DRIVER
 -P:    Andrey V. Savochkin
 -M:    saw@saw.sw.com.sg
 -S:    Maintained
 -
  EFS FILESYSTEM
  W:    http://aeschi.ch.eu.org/efs/
  S:    Orphan
@@@ -1766,13 -1768,6 +1774,13 @@@ L:    linuxppc-dev@ozlabs.or
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
  
 +FREESCALE IMX / MXC FRAMEBUFFER DRIVER
 +P:    Sascha Hauer
 +M:    kernel@pengutronix.de
 +L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +S:    Maintained
 +
  FREESCALE SOC FS_ENET DRIVER
  P:    Pantelis Antoniou
  M:    pantelis.antoniou@gmail.com
@@@ -1821,14 -1816,6 +1829,14 @@@ M:    hch@infradead.or
  W:    ftp://ftp.openlinux.org/pub/people/hch/vxfs
  S:    Maintained
  
 +FREEZER
 +P:    Pavel Machek
 +M:    pavel@suse.cz
 +P:    Rafael J. Wysocki
 +M:    rjw@sisk.pl
 +L:    linux-pm@lists.linux-foundation.org
 +S:    Supported
 +
  FTRACE
  P:    Steven Rostedt
  M:    rostedt@goodmis.org
@@@ -1870,7 -1857,7 +1878,7 @@@ P:      Haavard Skinnemoe
  M:    hskinnemoen@atmel.com
  S:    Supported
  
 -GENERIC HDLC DRIVER, N2, C101, PCI200SYN and WANXL DRIVERS
 +GENERIC HDLC (WAN) DRIVERS
  P:    Krzysztof Halasa
  M:    khc@pm.waw.pl
  W:    http://www.kernel.org/pub/linux/utils/net/hdlc/
@@@ -1904,37 -1891,32 +1912,37 @@@ S:   Maintaine
  GSPCA FINEPIX SUBDRIVER
  P:    Frank Zago
  M:    frank@zago.net
 -L:    video4linux-list@redhat.com
 +L:    linux-media@vger.kernel.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  GSPCA M5602 SUBDRIVER
  P:    Erik Andren
  M:    erik.andren@gmail.com
 -L:    video4linux-list@redhat.com
 +L:    linux-media@vger.kernel.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  GSPCA PAC207 SONIXB SUBDRIVER
  P:    Hans de Goede
  M:    hdegoede@redhat.com
 -L:    video4linux-list@redhat.com
 +L:    linux-media@vger.kernel.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  GSPCA T613 SUBDRIVER
  P:    Leandro Costantino
  M:    lcostantino@gmail.com
 -L:    video4linux-list@redhat.com
 +L:    linux-media@vger.kernel.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  GSPCA USB WEBCAM DRIVER
  P:    Jean-Francois Moine
  M:    moinejf@free.fr
  W:    http://moinejf.free.fr
 -L:    video4linux-list@redhat.com
 +L:    linux-media@vger.kernel.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  HARDWARE MONITORING
@@@ -2073,12 -2055,6 +2081,12 @@@ M:    mikulas@artax.karlin.mff.cuni.c
  W:    http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/hpfs/index-e.cgi
  S:    Maintained
  
 +HSO   3G Modem Driver (hso.c)
 +P:    Denis Joseph Barrow
 +M:    d.barow@option.com
 +W:    http://www.pharscape.org
 +S:    Maintained
 +
  HTCPEN TOUCHSCREEN DRIVER
  P:    Pau Oliva Fora
  M:    pof@eslack.org
@@@ -2102,8 -2078,7 +2110,8 @@@ M:      khali@linux-fr.or
  P:    Ben Dooks (embedded platforms)
  M:    ben-linux@fluff.org
  L:    linux-i2c@vger.kernel.org
 -T:    quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/
 +W:    http://i2c.wiki.kernel.org/
 +T:    quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
  S:    Maintained
  
  I2C-TINY-USB DRIVER
@@@ -2177,6 -2152,11 +2185,6 @@@ M:     Gadi Oxman <gadio@netvision.net.il
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
 -IDE-SCSI DRIVER
 -L:    linux-ide@vger.kernel.org
 -L:    linux-scsi@vger.kernel.org
 -S:    Orphan
 -
  IDLE-I7300
  P:    Andy Henroid
  M:    andrew.d.henroid@intel.com
@@@ -2276,11 -2256,6 +2284,11 @@@ M:    dan.j.williams@intel.co
  L:    linux-kernel@vger.kernel.org
  S:    Supported
  
 +INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
 +P:    Krzysztof Halasa
 +M:    khc@pm.waw.pl
 +S:    Maintained
 +
  INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
  P:    Deepak Saxena
  M:    dsaxena@plexity.net
@@@ -2333,14 -2308,6 +2341,14 @@@ W:    http://lists.sourceforge.net/mailman
  W:    http://ipw2200.sourceforge.net
  S:    Supported
  
 +INTEL WIRELESS WIMAX CONNECTION 2400
 +P:    Inaky Perez-Gonzalez
 +M:    inaky.perez-gonzalez@intel.com
 +M:    linux-wimax@intel.com
 +L:    wimax@linuxwimax.org
 +S:    Supported
 +W:    http://linuxwimax.org
 +
  INTEL WIRELESS WIFI LINK (iwlwifi)
  P:    Zhu Yi
  M:    yi.zhu@intel.com
@@@ -2465,8 -2432,7 +2473,8 @@@ P:      Hans Verkui
  M:    hverkuil@xs4all.nl
  L:    ivtv-devel@ivtvdriver.org
  L:    ivtv-users@ivtvdriver.org
 -L:    video4linux-list@redhat.com
 +L:    linux-media@vger.kernel.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  W:    http://www.ivtvdriver.org
  S:    Maintained
  
@@@ -2576,6 -2542,8 +2584,6 @@@ W:      http://kvm.qumranet.co
  S:    Supported
  
  KERNEL VIRTUAL MACHINE For Itanium (KVM/IA64)
 -P:    Anthony Xu
 -M:    anthony.xu@intel.com
  P:    Xiantao Zhang
  M:    xiantao.zhang@intel.com
  L:    kvm-ia64@vger.kernel.org
@@@ -2668,13 -2636,13 +2676,13 @@@ W:   http://www.hansenpartnership.com/voy
  S:    Maintained
  
  LINUX FOR POWERPC (32-BIT AND 64-BIT)
 -P:    Paul Mackerras
 -M:    paulus@samba.org
  P:    Benjamin Herrenschmidt
  M:    benh@kernel.crashing.org
 +P:    Paul Mackerras
 +M:    paulus@samba.org
  W:    http://www.penguinppc.org/
  L:    linuxppc-dev@ozlabs.org
 -T:    git kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc.git
 +T:    git kernel.org:/pub/scm/linux/kernel/git/benh/powerpc.git
  S:    Supported
  
  LINUX FOR POWER MACINTOSH
@@@ -3019,7 -2987,6 +3027,7 @@@ MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CO
  P:    Felipe Balbi
  M:    felipe.balbi@nokia.com
  L:    linux-usb@vger.kernel.org
 +T:    git gitorious.org:/musb/mainline.git
  S:    Maintained
  
  MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
@@@ -3226,8 -3193,7 +3234,8 @@@ S:      Maintaine
  OMNIVISION OV7670 SENSOR DRIVER
  P:    Jonathan Corbet
  M:    corbet@lwn.net
 -L:    video4linux-list@redhat.com
 +L:    linux-media@vger.kernel.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  ONENAND FLASH DRIVER
@@@ -3505,19 -3471,12 +3513,19 @@@ L:   linuxppc-dev@ozlabs.or
  L:    cbe-oss-dev@ozlabs.org
  S:    Supported
  
 +PS3VRAM DRIVER
 +P:    Jim Paris
 +M:    jim@jtan.com
 +L:    cbe-oss-dev@ozlabs.org
 +S:    Maintained
 +
  PVRUSB2 VIDEO4LINUX DRIVER
  P:    Mike Isely
  M:    isely@pobox.com
  L:    pvrusb2@isely.net       (subscribers-only)
 -L:    video4linux-list@redhat.com
 +L:    linux-media@vger.kernel.org
  W:    http://www.isely.net/pvrusb2/
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  PXA2xx/PXA3xx SUPPORT
@@@ -3663,26 -3622,16 +3671,26 @@@ L:   linux-hams@vger.kernel.or
  W:    http://www.linux-ax25.org/
  S:    Maintained
  
 -RTL818X WIRELESS DRIVER
 -P:    Michael Wu
 -M:    flamingice@sourmilk.net
 -P:    Andrea Merello
 -M:    andreamrl@tiscali.it
 +RTL8180 WIRELESS DRIVER
 +P:    John W. Linville
 +M:    linville@tuxdriver.com
  L:    linux-wireless@vger.kernel.org
  W:    http://linuxwireless.org/
 -T:    git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
 +T:    git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-testing.git
  S:    Maintained
  
 +RTL8187 WIRELESS DRIVER
 +P:     Herton Ronaldo Krzesinski
 +M:      herton@mandriva.com.br
 +P:      Hin-Tak Leung
 +M       htl10@users.sourceforge.net
 +P:      Larry Finger
 +M:      Larry.Finger@lwfinger.net
 +L:      linux-wireless@vger.kernel.org
 +W:      http://linuxwireless.org/
 +T:      git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-testing.git
 +S:      Maintained
 +
  S3 SAVAGE FRAMEBUFFER DRIVER
  P:    Antonino Daplas
  M:    adaplas@gmail.com
@@@ -3737,8 -3686,6 +3745,8 @@@ S:      Supporte
  SAA7146 VIDEO4LINUX-2 DRIVER
  P:    Michael Hunold
  M:    michael@mihu.de
 +L:    linux-media@vger.kernel.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  W:    http://www.mihu.de/linux/saa7146
  S:    Maintained
  
@@@ -3974,18 -3921,6 +3982,18 @@@ M:    mhoffman@lightlink.co
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  
 +SMSC911x ETHERNET DRIVER
 +P:    Steve Glendinning
 +M:    steve.glendinning@smsc.com
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +
 +SMSC9420 PCI ETHERNET DRIVER
 +P:    Steve Glendinning
 +M:    steve.glendinning@smsc.com
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +
  SMX UIO Interface
  P:    Ben Nizette
  M:    bn@niasdigital.com
@@@ -4002,8 -3937,7 +4010,8 @@@ S:      Maintaine
  SOC-CAMERA V4L2 SUBSYSTEM
  P:    Guennadi Liakhovetski
  M:    g.liakhovetski@gmx.de
 -L:    video4linux-list@redhat.com
 +L:    linux-media@vger.kernel.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  SOEKRIS NET48XX LED SUPPORT
@@@ -4051,7 -3985,7 +4059,7 @@@ M:      tiwai@suse.d
  L:    alsa-devel@alsa-project.org (subscribers-only)
  S:    Maintained
  
 -SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT
 +SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
  P:    Liam Girdwood
  M:    lrg@slimlogic.co.uk
  P:    Mark Brown
@@@ -4061,12 -3995,10 +4069,12 @@@ L:   alsa-devel@alsa-project.org (subscri
  W:    http://alsa-project.org/main/index.php/ASoC
  S:    Supported
  
 -SPARC (sparc32)
 -P:    William L. Irwin
 -M:    wli@holomorphy.com
 +SPARC + UltraSPARC (sparc/sparc64)
 +P:    David S. Miller
 +M:    davem@davemloft.net
  L:    sparclinux@vger.kernel.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
 +T:    git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
  S:    Maintained
  
  SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
@@@ -4097,13 -4029,6 +4105,13 @@@ L:    cbe-oss-dev@ozlabs.or
  W:    http://www.ibm.com/developerworks/power/cell/
  S:    Supported
  
 +SQUASHFS FILE SYSTEM
 +P:    Phillip Lougher
 +M:    phillip@lougher.demon.co.uk
 +L:    squashfs-devel@lists.sourceforge.net (subscribers-only)
 +W:    http://squashfs.org.uk
 +S:    Maintained
 +
  SRM (Alpha) environment access
  P:    Jan-Benedict Glaw
  M:    jbglaw@lug-owl.de
@@@ -4285,10 -4210,9 +4293,10 @@@ L:    tpmdd-devel@lists.sourceforge.net (m
  S:    Maintained
  
  TRIVIAL PATCHES
 -P:    Jesper Juhl
 +P:    Jiri Kosina
  M:    trivial@kernel.org
  L:    linux-kernel@vger.kernel.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/jikos/trivial.git
  S:    Maintained
  
  TTY LAYER
@@@ -4358,6 -4282,13 +4366,6 @@@ M:     dushistov@mail.r
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
 -UltraSPARC (sparc64)
 -P:    David S. Miller
 -M:    davem@davemloft.net
 -L:    sparclinux@vger.kernel.org
 -T:    git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
 -S:    Maintained
 -
  ULTRA-WIDEBAND (UWB) SUBSYSTEM:
  P:    David Vrabel
  M:    david.vrabel@csr.com
@@@ -4429,8 -4360,7 +4437,8 @@@ USB ET61X[12]51 DRIVE
  P:    Luca Risolia
  M:    luca.risolia@studio.unibo.it
  L:    linux-usb@vger.kernel.org
 -L:    video4linux-list@redhat.com
 +L:    linux-media@vger.kernel.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  W:    http://www.linux-projects.org
  S:    Maintained
  
@@@ -4579,8 -4509,7 +4587,8 @@@ USB SN9C1xx DRIVE
  P:    Luca Risolia
  M:    luca.risolia@studio.unibo.it
  L:    linux-usb@vger.kernel.org
 -L:    video4linux-list@redhat.com
 +L:    linux-media@vger.kernel.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  W:    http://www.linux-projects.org
  S:    Maintained
  
@@@ -4609,8 -4538,7 +4617,8 @@@ USB VIDEO CLAS
  P:    Laurent Pinchart
  M:    laurent.pinchart@skynet.be
  L:    linux-uvc-devel@lists.berlios.de (subscribers-only)
 -L:    video4linux-list@redhat.com
 +L:    linux-media@vger.kernel.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  W:    http://linux-uvc.berlios.de
  S:    Maintained
  
@@@ -4618,8 -4546,7 +4626,8 @@@ USB W996[87]CF DRIVE
  P:    Luca Risolia
  M:    luca.risolia@studio.unibo.it
  L:    linux-usb@vger.kernel.org
 -L:    video4linux-list@redhat.com
 +L:    linux-media@vger.kernel.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  W:    http://www.linux-projects.org
  S:    Maintained
  
@@@ -4633,8 -4560,7 +4641,8 @@@ USB ZC0301 DRIVE
  P:    Luca Risolia
  M:    luca.risolia@studio.unibo.it
  L:    linux-usb@vger.kernel.org
 -L:    video4linux-list@redhat.com
 +L:    linux-media@vger.kernel.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  W:    http://www.linux-projects.org
  S:    Maintained
  
@@@ -4649,8 -4575,7 +4657,8 @@@ USB ZR364XX DRIVE
  P:    Antoine Jacquet
  M:    royale@zerezo.com
  L:    linux-usb@vger.kernel.org
 -L:    video4linux-list@redhat.com
 +L:    linux-media@vger.kernel.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  W:    http://royale.zerezo.com/zr364xx/
  S:    Maintained
  
@@@ -4719,10 -4644,10 +4727,10 @@@ S:   Maintaine
  VIDEO FOR LINUX (V4L)
  P:    Mauro Carvalho Chehab
  M:    mchehab@infradead.org
 -M:    v4l-dvb-maintainer@linuxtv.org
 +L:    linux-media@vger.kernel.org
  L:    video4linux-list@redhat.com
  W:    http://linuxtv.org
 -T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  VLAN (802.1Q)
@@@ -4795,14 -4720,6 +4803,14 @@@ M:    zaga@fly.cc.fer.h
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
  
 +WIMAX STACK
 +P:    Inaky Perez-Gonzalez
 +M:    inaky.perez-gonzalez@intel.com
 +M:    linux-wimax@intel.com
 +L:    wimax@linuxwimax.org
 +S:    Supported
 +W:    http://linuxwimax.org
 +
  WIMEDIA LLC PROTOCOL (WLP) SUBSYSTEM
  P:    David Vrabel
  M:    david.vrabel@csr.com
@@@ -4858,11 -4775,11 +4866,11 @@@ S:   Supporte
  
  XFS FILESYSTEM
  P:    Silicon Graphics Inc
 -P:    Tim Shimmin
 +P:    Bill O'Donnell
  M:    xfs-masters@oss.sgi.com
  L:    xfs@oss.sgi.com
  W:    http://oss.sgi.com/projects/xfs
 -T:    git git://oss.sgi.com:8090/xfs/xfs-2.6.git
 +T:    git://oss.sgi.com/xfs/xfs.git
  S:    Supported
  
  XILINX SYSTEMACE DRIVER

diff --combined fs/btrfs/super.c
index db9fb3b,4c0b756..f3fd7e2
--- 1/fs/btrfs/super.c
--- 2/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@@ -37,8 -37,6 +37,7 @@@
  #include <linux/ctype.h>
  #include <linux/namei.h>
  #include <linux/miscdevice.h>
- #include <linux/version.h>
 +#include <linux/magic.h>
  #include "compat.h"
  #include "ctree.h"
  #include "disk-io.h"
@@@ -52,6 -50,7 +51,6 @@@
  #include "export.h"
  #include "compression.h"
  
 -#define BTRFS_SUPER_MAGIC 0x9123683E
  
  static struct super_operations btrfs_super_ops;
  
@@@ -583,17 -582,18 +582,18 @@@ static long btrfs_control_ioctl(struct 
        struct btrfs_ioctl_vol_args *vol;
        struct btrfs_fs_devices *fs_devices;
        int ret = -ENOTTY;
-       int len;
  
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
  
        vol = kmalloc(sizeof(*vol), GFP_KERNEL);
+       if (!vol)
+               return -ENOMEM;
+ 
        if (copy_from_user(vol, (void __user *)arg, sizeof(*vol))) {
                ret = -EFAULT;
                goto out;
        }
-       len = strnlen(vol->name, BTRFS_PATH_NAME_MAX);
  
        switch (cmd) {
        case BTRFS_IOC_SCAN_DEV:
@@@ -606,20 -606,18 +606,20 @@@ out
        return ret;
  }
  
 -static void btrfs_write_super_lockfs(struct super_block *sb)
 +static int btrfs_freeze(struct super_block *sb)
  {
        struct btrfs_root *root = btrfs_sb(sb);
        mutex_lock(&root->fs_info->transaction_kthread_mutex);
        mutex_lock(&root->fs_info->cleaner_mutex);
 +      return 0;
  }
  
 -static void btrfs_unlockfs(struct super_block *sb)
 +static int btrfs_unfreeze(struct super_block *sb)
  {
        struct btrfs_root *root = btrfs_sb(sb);
        mutex_unlock(&root->fs_info->cleaner_mutex);
        mutex_unlock(&root->fs_info->transaction_kthread_mutex);
 +      return 0;
  }
  
  static struct super_operations btrfs_super_ops = {
@@@ -634,8 -632,8 +634,8 @@@
        .destroy_inode  = btrfs_destroy_inode,
        .statfs         = btrfs_statfs,
        .remount_fs     = btrfs_remount,
 -      .write_super_lockfs = btrfs_write_super_lockfs,
 -      .unlockfs       = btrfs_unlockfs,
 +      .freeze_fs      = btrfs_freeze,
 +      .unfreeze_fs    = btrfs_unfreeze,
  };
  
  static const struct file_operations btrfs_ctl_fops = {