Merge branch 'master'

diff --combined CREDITS
index 529534b,6f50be3..2db65a5
--- 1/CREDITS
--- 2/CREDITS
+++ b/CREDITS
@@@ -1194,15 -1194,9 +1194,9 @@@ S: Brecksville, OH  44141-133
  S: USA
  
  N: Tristan Greaves
- E: Tristan.Greaves@icl.com
- E: tmg296@ecs.soton.ac.uk
- W: http://www.ecs.soton.ac.uk/~tmg296
+ E: tristan@extricate.org
+ W: http://www.extricate.org/
  D: Miscellaneous ipv4 sysctl patches
- S: 15 Little Mead
- S: Denmead
- S: Hampshire
- S: PO7 6HS
- S: United Kingdom
  
  N: Michael A. Griffith
  E: grif@cs.ucr.edu
@@@ -3551,11 -3545,11 +3545,11 @@@ S: Fargo, North Dakota 5812
  S: USA
  
  N: Steven Whitehouse
 -E: SteveW@ACM.org
 +E: steve@chygwyn.com
  W: http://www.chygwyn.com/~steve
 -D: Linux DECnet project: http://www.sucs.swan.ac.uk/~rohan/DECnet/index.html
 +D: Linux DECnet project
  D: Minor debugging of other networking protocols.
 -D: Misc bug fixes and filesystem development
 +D: Misc bug fixes and GFS2 filesystem development
  
  N: Hans-Joachim Widmaier
  E: hjw@zvw.de

diff --combined MAINTAINERS
index f4bd145,5e33558..c676253
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -819,16 -819,6 +819,16 @@@ M:       jack@suse.c
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
 +DISTRIBUTED LOCK MANAGER
 +P:    Patrick Caulfield
 +M:    pcaulfie@redhat.com
 +P:    David Teigland
 +M:    teigland@redhat.com
 +L:    linux-cluster@redhat.com
 +W:    http://sources.redhat.com/cluster/
 +T:    git kernel.org:/pub/scm/linux/kernel/git/steve/gfs-2.6.git
 +S:    Supported
 +
  DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
  P:    Tobias Ringstrom
  M:    tori@unhappy.mine.nu
@@@ -1079,14 -1069,6 +1079,14 @@@ M:    khc@pm.waw.p
  W:    http://www.kernel.org/pub/linux/utils/net/hdlc/
  S:    Maintained
  
 +GFS2 FILE SYSTEM
 +P:    Steven Whitehouse
 +M:    swhiteho@redhat.com
 +L:    linux-cluster@redhat.com
 +W:    http://sources.redhat.com/cluster/
 +T:    git kernel.org:/pub/scm/linux/kernel/git/steve/gfs-2.6.git
 +S:    Supported
 +
  GIGASET ISDN DRIVERS
  P:    Hansjoerg Lipp
  M:    hjlipp@web.de
@@@ -1498,10 -1480,11 +1498,11 @@@ L:   netdev@vger.kernel.or
  S:    Maintained
  
  IRDA SUBSYSTEM
- P:    Jean Tourrilhes
+ P:    Samuel Ortiz
+ M:    samuel@sortiz.org
  L:    irda-users@lists.sourceforge.net (subscribers-only)
  W:    http://irda.sourceforge.net/
- S:    Odd Fixes
+ S:    Maintained
  
  ISAPNP
  P:    Jaroslav Kysela

diff --combined mm/filemap.c
index 1120338,fd57442..82c4488
--- 1/mm/filemap.c
--- 2/mm/filemap.c
+++ b/mm/filemap.c
@@@ -697,6 -697,38 +697,38 @@@ unsigned find_get_pages(struct address_
        return ret;
  }
  
+ /**
+  * find_get_pages_contig - gang contiguous pagecache lookup
+  * @mapping:  The address_space to search
+  * @index:    The starting page index
+  * @nr_pages: The maximum number of pages
+  * @pages:    Where the resulting pages are placed
+  *
+  * find_get_pages_contig() works exactly like find_get_pages(), except
+  * that the returned number of pages are guaranteed to be contiguous.
+  *
+  * find_get_pages_contig() returns the number of pages which were found.
+  */
+ unsigned find_get_pages_contig(struct address_space *mapping, pgoff_t index,
+                              unsigned int nr_pages, struct page **pages)
+ {
+       unsigned int i;
+       unsigned int ret;
+ 
+       read_lock_irq(&mapping->tree_lock);
+       ret = radix_tree_gang_lookup(&mapping->page_tree,
+                               (void **)pages, index, nr_pages);
+       for (i = 0; i < ret; i++) {
+               if (pages[i]->mapping == NULL || pages[i]->index != index)
+                       break;
+ 
+               page_cache_get(pages[i]);
+               index++;
+       }
+       read_unlock_irq(&mapping->tree_lock);
+       return i;
+ }
+ 
  /*
   * Like find_get_pages, except we only return pages which are tagged with
   * `tag'.   We update *index to index the next page for the traversal.
@@@ -1012,7 -1044,6 +1044,7 @@@ success
        desc->arg.buf += size;
        return size;
  }
 +EXPORT_SYMBOL(file_read_actor);
  
  /*
   * This is the "read()" routine for all filesystems