Merge branch 'core/xen' into x86/urgent

diff --combined MAINTAINERS
index 98f93f4,474ec0c..cf0ab3a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1581,6 -1581,13 +1581,13 @@@ L:    bluesmoke-devel@lists.sourceforge.ne
  W:    bluesmoke.sourceforge.net
  S:    Maintained
  
+ EDAC-I5400
+ P:    Mauro Carvalho Chehab
+ M:    mchehab@redhat.com
+ L:    bluesmoke-devel@lists.sourceforge.net
+ W:    bluesmoke.sourceforge.net
+ S:    Maintained
+ 
  EDAC-I82975X
  P:    Ranganathan Desikan
  P:    Arvind R.
@@@ -1814,6 -1821,14 +1821,14 @@@ M:    hch@infradead.or
  W:    ftp://ftp.openlinux.org/pub/people/hch/vxfs
  S:    Maintained
  
+ FREEZER
+ P:    Pavel Machek
+ M:    pavel@suse.cz
+ P:    Rafael J. Wysocki
+ M:    rjw@sisk.pl
+ L:    linux-pm@lists.linux-foundation.org
+ S:    Supported
+ 
  FTRACE
  P:    Steven Rostedt
  M:    rostedt@goodmis.org
@@@ -2087,7 -2102,8 +2102,8 @@@ M:      khali@linux-fr.or
  P:    Ben Dooks (embedded platforms)
  M:    ben-linux@fluff.org
  L:    linux-i2c@vger.kernel.org
- T:    quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/
+ W:    http://i2c.wiki.kernel.org/
+ T:    quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
  S:    Maintained
  
  I2C-TINY-USB DRIVER
@@@ -2820,8 -2836,6 +2836,6 @@@ S:      Maintaine
  MAC80211
  P:    Johannes Berg
  M:    johannes@sipsolutions.net
- P:    Michael Wu
- M:    flamingice@sourmilk.net
  L:    linux-wireless@vger.kernel.org
  W:    http://linuxwireless.org/
  T:    git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
@@@ -4827,7 -4841,6 +4841,7 @@@ P:      Ingo Molna
  M:    mingo@redhat.com
  P:    H. Peter Anvin
  M:    hpa@zytor.com
 +M:    x86@kernel.org
  L:    linux-kernel@vger.kernel.org
  T:    git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
  S:    Maintained
@@@ -4843,11 -4856,11 +4857,11 @@@ S:   Supporte
  
  XFS FILESYSTEM
  P:    Silicon Graphics Inc
- P:    Tim Shimmin
+ P:    Bill O'Donnell
  M:    xfs-masters@oss.sgi.com
  L:    xfs@oss.sgi.com
  W:    http://oss.sgi.com/projects/xfs
- T:    git git://oss.sgi.com:8090/xfs/xfs-2.6.git
+ T:    git://oss.sgi.com/xfs/xfs.git
  S:    Supported
  
  XILINX SYSTEMACE DRIVER