Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
  nilfs2: update mailing list address
  nilfs2: Storage class should be before const qualifier
  nilfs2: trivial coding style fix

diff --combined MAINTAINERS
index c22d597,0121c61..6914588
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2169,9 -2169,10 +2169,9 @@@ F:     drivers/hwmon/f75375s.
  F:    include/linux/f75375s.h
  
  FIREWIRE SUBSYSTEM
 -M:    Kristian Hoegsberg <krh@redhat.com>
  M:    Stefan Richter <stefanr@s5r6.in-berlin.de>
  L:    linux1394-devel@lists.sourceforge.net
 -W:    http://www.linux1394.org/
 +W:    http://ieee1394.wiki.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
  S:    Maintained
  F:    drivers/firewire/
@@@ -2704,14 -2705,22 +2704,14 @@@ S:   Supporte
  F:    drivers/idle/i7300_idle.c
  
  IEEE 1394 SUBSYSTEM
 -M:    Ben Collins <ben.collins@ubuntu.com>
  M:    Stefan Richter <stefanr@s5r6.in-berlin.de>
  L:    linux1394-devel@lists.sourceforge.net
 -W:    http://www.linux1394.org/
 +W:    http://ieee1394.wiki.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
 -S:    Maintained
 +S:    Obsolete
  F:    Documentation/debugging-via-ohci1394.txt
  F:    drivers/ieee1394/
  
 -IEEE 1394 RAW I/O DRIVER
 -M:    Dan Dennedy <dan@dennedy.org>
 -M:    Stefan Richter <stefanr@s5r6.in-berlin.de>
 -L:    linux1394-devel@lists.sourceforge.net
 -S:    Maintained
 -F:    drivers/ieee1394/raw1394*
 -
  IEEE 802.15.4 SUBSYSTEM
  M:    Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  M:    Sergey Lapin <slapin@ossfans.org>
@@@ -3873,7 -3882,7 +3873,7 @@@ F:      drivers/net/ni5010.
  
  NILFS2 FILESYSTEM
  M:    KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp>
- L:    users@nilfs.org
+ L:    linux-nilfs@vger.kernel.org
  W:    http://www.nilfs.org/en/
  S:    Supported
  F:    Documentation/filesystems/nilfs2.txt