[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-mips-cvs
Subject:    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
From:       linux-mips () linux-mips ! org
Date:       2010-09-30 23:59:00
Message-ID: S1491994Ab0I3X7E/20100930235904Z+7799 () eddie ! linux-mips ! org
[Download RAW message or body]

Author: Ralf Baechle <ralf@linux-mips.org> Wed Sep 22 09:32:56 2010 +0100
Commit: 54e56c26a2e450d7e604c16b0ff5f104cbd98247
Gitweb: http://git.linux-mips.org/g/linux/54e56c26
Branch: master

---

 arch/Kconfig                          |    4 +
 arch/x86/include/asm/hw_breakpoint.h  |    2 -
 arch/x86/kernel/hw_breakpoint.c       |   40 +++++++-------
 arch/x86/lguest/boot.c                |   13 +++--
 arch/x86/oprofile/nmi_int.c           |    4 +
 drivers/char/agp/intel-agp.c          |    2 +
 drivers/char/agp/intel-agp.h          |    2 +
 drivers/char/virtio_console.c         |    6 ++
 drivers/gpu/drm/i915/i915_drv.c       |    1 
 drivers/gpu/drm/i915/i915_gem.c       |   37 +++++++++----
 drivers/gpu/drm/i915/i915_gem_evict.c |    9 +++
 drivers/gpu/drm/i915/i915_suspend.c   |   36 ++++++++++---
 drivers/gpu/drm/i915/intel_crt.c      |    4 +
 drivers/gpu/drm/i915/intel_display.c  |    8 +++
 fs/ceph/Kconfig                       |    1 
 fs/ceph/addr.c                        |    7 +--
 fs/ceph/caps.c                        |   27 +++++++---
 fs/ceph/dir.c                         |   10 +++-
 fs/ceph/inode.c                       |   11 ++--
 fs/ceph/mds_client.c                  |    2 +
 fs/ceph/pagelist.c                    |   12 ++++
 fs/ceph/snap.c                        |   92 +++++++++++----------------------
 fs/ceph/super.h                       |    5 +-
 include/linux/fs.h                    |    4 +
 kernel/hw_breakpoint.c                |    3 +
 kernel/sched.c                        |    8 +--
 kernel/sched_fair.c                   |    2 -
 27 files changed, 206 insertions(+), 146 deletions(-)

[prev in list] [next in list] [prev in thread] [next in thread]