Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6

* 'for-linus' of git://git.infradead.org/ubi-2.6:
  UBI: remove unused variable
  UBI: add me to MAINTAINERS
  JFFS2: add UBI support
  UBI: Unsorted Block Images

diff --combined MAINTAINERS
index f56c7e172cee12c6bf457767800662a20e1d48ed,66d7e849313446305ff7461895ae7365d53166c1..2e83c82aa13d41706bde4e7417404fb0be75b361
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -384,7 -384,7 +384,7 @@@ S: Supporte
  
  APPLETALK NETWORK LAYER
  P:    Arnaldo Carvalho de Melo
 -M:    acme@conectiva.com.br
 +M:    acme@ghostprotocols.net
  S:    Maintained
  
  ARC FRAMEBUFFER DRIVER
@@@ -656,7 -656,6 +656,7 @@@ S: Supporte
  ATMEL WIRELESS DRIVER
  P:    Simon Kelley
  M:    simon@thekelleys.org.uk
 +L:    linux-wireless@vger.kernel.org
  W:    http://www.thekelleys.org.uk/atmel
  W:    http://atmelwlandriver.sourceforge.net/
  S:    Maintained
@@@ -712,7 -711,6 +712,7 @@@ P: Larry Finge
  M:    Larry.Finger@lwfinger.net
  P:    Stefano Brivio
  M:    st3@riseup.net
 +L:    linux-wireless@vger.kernel.org
  W:    http://bcm43xx.berlios.de/
  S:    Maintained
  
@@@ -894,12 -892,6 +894,12 @@@ M:       maxextreme@gmail.co
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
 +CFG80211 and NL80211
 +P:    Johannes Berg
 +M:    johannes@sipsolutions.net
 +L:    linux-wireless@vger.kernel.org
 +S:    Maintained
 +
  COMMON INTERNET FILE SYSTEM (CIFS)
  P:    Steve French
  M:    sfrench@samba.org
@@@ -1042,8 -1034,9 +1042,8 @@@ S:      Maintaine
  
  CYCLADES 2X SYNC CARD DRIVER
  P:    Arnaldo Carvalho de Melo
 -M:    acme@conectiva.com.br
 -W:    http://advogato.org/person/acme
 -L:    cycsyn-devel@bazar.conectiva.com.br
 +M:    acme@ghostprotocols.net
 +W:    http://oops.ghostprotocols.net:81/blog
  S:    Maintained
  
  CYCLADES ASYNC MUX DRIVER
@@@ -1084,7 -1077,7 +1084,7 @@@ S:      Maintaine
  
  DCCP PROTOCOL
  P:    Arnaldo Carvalho de Melo
 -M:    acme@mandriva.com
 +M:    acme@ghostprotocols.net
  L:    dccp@vger.kernel.org
  W:    http://linux-net.osdl.org/index.php/DCCP
  S:    Maintained
@@@ -1565,7 -1558,6 +1565,7 @@@ S:      Supporte
  HOST AP DRIVER
  P:    Jouni Malinen
  M:    jkmaline@cc.hut.fi
 +L:    linux-wireless@vger.kernel.org
  L:    hostap@shmoo.com
  W:    http://hostap.epitest.fi/
  S:    Maintained
@@@ -1838,7 -1830,6 +1838,7 @@@ P:      Yi Zh
  M:    yi.zhu@intel.com
  P:    James Ketrenos
  M:    jketreno@linux.intel.com
 +L:    linux-wireless@vger.kernel.org
  L:    ipw2100-devel@lists.sourceforge.net
  L:    http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
  W:    http://ipw2100.sourceforge.net
@@@ -1849,7 -1840,6 +1849,7 @@@ P:      Yi Zh
  M:    yi.zhu@intel.com
  P:    James Ketrenos
  M:    jketreno@linux.intel.com
 +L:    linux-wireless@vger.kernel.org
  L:    ipw2100-devel@lists.sourceforge.net
  L:    http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
  W:    http://ipw2200.sourceforge.net
@@@ -1881,7 -1871,7 +1881,7 @@@ S:      Supporte
  
  IPX NETWORK LAYER
  P:    Arnaldo Carvalho de Melo
 -M:    acme@conectiva.com.br
 +M:    acme@ghostprotocols.net
  L:    netdev@vger.kernel.org
  S:    Maintained
  
@@@ -2118,7 -2108,7 +2118,7 @@@ S:      Supporte
  
  LLC (802.2)
  P:    Arnaldo Carvalho de Melo
 -M:    acme@conectiva.com.br
 +M:    acme@ghostprotocols.net
  S:    Maintained
  
  LINUX FOR 64BIT POWERPC
@@@ -2246,6 -2236,14 +2246,14 @@@ L:    linux-mtd@lists.infradead.or
  T:    git git://git.infradead.org/mtd-2.6.git
  S:    Maintained
  
+ UNSORTED BLOCK IMAGES (UBI)
+ P:    Artem Bityutskiy
+ M:    dedekind@infradead.org
+ W:    http://www.linux-mtd.infradead.org/
+ L:    linux-mtd@lists.infradead.org
+ T:    git git://git.infradead.org/ubi-2.6.git
+ S:    Maintained
+ 
  MICROTEK X6 SCANNER
  P:    Oliver Neukum
  M:    oliver@neukum.name
@@@ -2542,7 -2540,6 +2550,7 @@@ P:      Pavel Roski
  M:    proski@gnu.org
  P:    David Gibson
  M:    hermes@gibson.dropbear.id.au
 +L:    linux-wireless@vger.kernel.org
  L:    orinoco-users@lists.sourceforge.net
  L:    orinoco-devel@lists.sourceforge.net
  W:    http://www.nongnu.org/orinoco/
@@@ -2722,7 -2719,7 +2730,7 @@@ S:      Supporte
  PRISM54 WIRELESS DRIVER
  P:    Prism54 Development Team
  M:    developers@islsm.org
 -L:    netdev@vger.kernel.org
 +L:    linux-wireless@vger.kernel.org
  W:    http://prism54.org
  S:    Maintained
  
@@@ -2793,7 -2790,7 +2801,7 @@@ S:      Maintaine
  RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
  P:    Corey Thomas
  M:    corey@world.std.com
 -L:    linux-kernel@vger.kernel.org
 +L:    linux-wireless@vger.kernel.org
  S:    Maintained
  
  RANDOM NUMBER DRIVER
@@@ -3056,7 -3053,7 +3064,7 @@@ M:      josejx@gentoo.or
  P:    Daniel Drake
  M:    dsd@gentoo.org
  W:    http://softmac.sipsolutions.net/
 -L:    netdev@vger.kernel.org
 +L:    linux-wireless@vger.kernel.org
  S:    Maintained
  
  SOFTWARE RAID (Multiple Disks) SUPPORT
@@@ -3761,7 -3758,6 +3769,7 @@@ S:      Maintaine
  WAVELAN NETWORK DRIVER & WIRELESS EXTENSIONS
  P:    Jean Tourrilhes
  M:    jt@hpl.hp.com
 +L:    linux-wireless@vger.kernel.org
  W:    http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
  S:    Maintained
  
@@@ -3778,9 -3774,8 +3786,9 @@@ S:      Maintaine
  
  WL3501 WIRELESS PCMCIA CARD DRIVER
  P:    Arnaldo Carvalho de Melo
 -M:    acme@conectiva.com.br
 -W:    http://advogato.org/person/acme
 +M:    acme@ghostprotocols.net
 +L:    linux-wireless@vger.kernel.org
 +W:    http://oops.ghostprotocols.net:81/blog
  S:    Maintained
  
  X.25 NETWORK LAYER
@@@ -3843,7 -3838,6 +3851,7 @@@ M:      dsd@gentoo.or
  P:    Ulrich Kunitz
  M:    kune@deine-taler.de
  W:    http://zd1211.ath.cx/wiki/DriverRewrite
 +L:    linux-wireless@vger.kernel.org
  L:    zd1211-devs@lists.sourceforge.net (subscribers-only)
  S:    Maintained