Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

diff --combined MAINTAINERS
index f3bbc7553b894bfe42c054643c1ad72170d08a17,1d2edb491b3423da28b7803d277db9b184348162..bb5da4631ea483bcfa61585ab394d13c5550fa8e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1255,8 -1255,8 +1255,8 @@@ W:      http://linux-net.osdl.org/index.php/
  S:    Maintained
  
  DECnet NETWORK LAYER
- P:    Patrick Caulfield
- M:    patrick@tykepenguin.com
+ P:    Christine Caulfield
+ M:    christine.caulfield@googlemail.com
  W:    http://linux-decnet.sourceforge.net
  L:    linux-decnet-user@lists.sourceforge.net
  S:    Maintained
@@@ -1318,8 -1318,8 +1318,8 @@@ L:      linux-kernel@vger.kernel.or
  S:    Maintained
  
  DISTRIBUTED LOCK MANAGER
- P:    Patrick Caulfield
- M:    pcaulfie@redhat.com
+ P:    Christine Caulfield
+ M:    ccaulfie@redhat.com
  P:    David Teigland
  M:    teigland@redhat.com
  L:    cluster-devel@redhat.com
@@@ -1616,6 -1616,7 +1616,7 @@@ S:      Maintaine
  FILESYSTEMS (VFS and infrastructure)
  P:    Alexander Viro
  M:    viro@zeniv.linux.org.uk
+ L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
  
  FIREWIRE SUBSYSTEM (drivers/firewire, <linux/firewire*.h>)
@@@ -3561,6 -3562,8 +3562,8 @@@ P:      Christoph Lamete
  M:    clameter@sgi.com
  P:    Pekka Enberg
  M:    penberg@cs.helsinki.fi
+ P:    Matt Mackall
+ M:    mpm@selenic.com
  L:    linux-mm@kvack.org
  S:    Maintained
  
@@@ -3823,7 -3826,7 +3826,7 @@@ S:      Maintaine
  
  TI OMAP MMC INTERFACE DRIVER
  P:    Carlos Aguiar, Anderson Briglia and Syed Khasim
 -M:    linux-omap-open-source@linux.omap.com (subscribers only)
 +M:    linux-omap@vger.kernel.org
  W:    http://linux.omap.com
  W:    http://www.muru.com/linux/omap/
  S:    Maintained