Merge branch 'master' into gfs2

diff --combined CREDITS
index f41e1d2,0fe904e..3030802
--- 1/CREDITS
--- 2/CREDITS
+++ b/CREDITS
@@@ -2209,7 -2209,7 +2209,7 @@@ S: (address available on request
  S: USA
  
  N: Ian McDonald
- E: iam4@cs.waikato.ac.nz
+ E: ian.mcdonald@jandi.co.nz
  E: imcdnzl@gmail.com
  W: http://wand.net.nz/~iam4
  W: http://imcdnzl.blogspot.com
@@@ -3541,11 -3541,11 +3541,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 a050d7c,3bab239..2d036ff
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -875,16 -875,6 +875,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:    cluster-devel@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
@@@ -899,6 -889,12 +899,12 @@@ M:       rdunlap@xenotime.ne
  T:    git http://tali.admingilde.org/git/linux-docbook.git
  S:    Maintained
  
+ DOCKING STATION DRIVER
+ P:    Kristen Carlson Accardi
+ M:    kristen.c.accardi@intel.com
+ L:    linux-acpi@vger.kernel.org
+ S:    Maintained
+ 
  DOUBLETALK DRIVER
  P:    James R. Van Zandt
  M:    jrv@vanzandt.mv.com
@@@ -1139,14 -1135,6 +1145,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:    cluster-devel@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
@@@ -2674,6 -2662,14 +2680,14 @@@ M:    chrisw@sous-sol.or
  L:    stable@kernel.org
  S:    Maintained
  
+ STABLE BRANCH:
+ P:    Greg Kroah-Hartman
+ M:    greg@kroah.com
+ P:    Chris Wright
+ M:    chrisw@sous-sol.org
+ L:    stable@kernel.org
+ S:    Maintained
+ 
  TPM DEVICE DRIVER
  P:    Kylene Hall
  M:    kjhall@us.ibm.com

diff --combined include/linux/fs.h
index 83abd9d,555bc19..4e93bf9
--- 1/include/linux/fs.h
--- 2/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -570,13 -570,14 +570,14 @@@ struct inode 
   * 3: quota file
   *
   * The locking order between these classes is
-  * parent -> child -> normal -> quota
+  * parent -> child -> normal -> xattr -> quota
   */
  enum inode_i_mutex_lock_class
  {
        I_MUTEX_NORMAL,
        I_MUTEX_PARENT,
        I_MUTEX_CHILD,
+       I_MUTEX_XATTR,
        I_MUTEX_QUOTA
  };
  
@@@ -1375,9 -1376,6 +1376,9 @@@ extern struct subsystem fs_subsys
  #define FLOCK_VERIFY_READ  1
  #define FLOCK_VERIFY_WRITE 2
  
 +/* /sys/fs */
 +extern struct subsystem fs_subsys;
 +
  extern int locks_mandatory_locked(struct inode *);
  extern int locks_mandatory_area(int, struct inode *, struct file *, loff_t, size_t);
  

diff --combined include/linux/kernel.h
index 06c2768,851aa1b..6fce604
--- 1/include/linux/kernel.h
--- 2/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@@ -32,7 -32,6 +32,7 @@@ extern const char linux_banner[]
  
  #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
  #define ALIGN(x,a) (((x)+(a)-1)&~((a)-1))
 +#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
  #define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))
  #define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
  
@@@ -211,6 -210,7 +211,7 @@@ extern enum system_states 
  extern void dump_stack(void);
  
  #ifdef DEBUG
+ /* If you are writing a driver, please use dev_dbg instead */
  #define pr_debug(fmt,arg...) \
        printk(KERN_DEBUG fmt,##arg)
  #else