[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:       2007-09-24 12:09:41
Message-ID: S20022666AbXIXMJp/20070924120945Z+59458 () ftp ! linux-mips ! org
[Download RAW message or body]

Author: Ralf Baechle <ralf@linux-mips.org> Mon Sep 24 13:08:54 2007 +0100
Commit: dfcf6c4470bc72aa89f981f5170f5943eedf2ddd
Gitweb: http://www.linux-mips.org/g/linux/dfcf6c44
Branch: master

---

 arch/arm/mach-ep93xx/core.c        |    2 -
 arch/arm/mm/cache-l2x0.c           |   12 +++++-
 arch/x86_64/Kconfig                |    8 ----
 arch/x86_64/ia32/ia32entry.S       |   18 +++++++--
 arch/x86_64/kernel/process.c       |    1 
 arch/x86_64/kernel/ptrace.c        |    4 --
 arch/x86_64/kernel/smp.c           |    2 -
 drivers/acpi/processor_core.c      |    2 +
 drivers/acpi/processor_idle.c      |   19 +++++++++
 drivers/acpi/sleep/Makefile        |    2 -
 drivers/acpi/sleep/main.c          |   57 ++++++++++++++++++++++++---
 drivers/acpi/sleep/poweroff.c      |   75 ------------------------------------
 drivers/acpi/video.c               |    3 -
 drivers/infiniband/hw/mlx4/qp.c    |   62 ++++++++++++++++++++++++------
 drivers/kvm/Kconfig                |    3 +
 drivers/power/power_supply_sysfs.c |    1 
 fs/ocfs2/aops.c                    |   33 +++++++++-------
 fs/ocfs2/file.c                    |    4 +-
 fs/ocfs2/localalloc.c              |    4 --
 fs/ocfs2/localalloc.h              |    2 -
 fs/ocfs2/suballoc.c                |   29 ++++++++++----
 fs/ocfs2/suballoc.h                |   11 +++++
 fs/ocfs2/vote.c                    |    4 +-
 fs/xfs/xfs_filestream.c            |    7 ++-
 fs/xfs/xfs_log_recover.c           |    4 +-
 include/acpi/processor.h           |    2 +
 include/asm-x86_64/pgalloc.h       |   73 ++++++++++++-----------------------
 include/asm-x86_64/pgtable.h       |    1 
 kernel/time/tick-broadcast.c       |   17 --------
 29 files changed, 244 insertions(+), 218 deletions(-)

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