[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:       2006-04-28 11:07:23
Message-ID: S8133420AbWD1LH3/20060428110729Z+694 () ftp ! linux-mips ! org
[Download RAW message or body]

Author: Ralf Baechle <ralf@linux-mips.org> Fri Apr 28 12:06:13 2006 +0100
Commit: 4c52697f67a49d3525830c551e3cbde6da612c03
Gitweb: http://www.linux-mips.org/g/linux/4c52697f
Branch: master

---

 Documentation/HOWTO                   |    3 +
 Documentation/pci.txt                 |   12 ++++
 arch/i386/pci/irq.c                   |    1 
 arch/ia64/Kconfig                     |    2 +
 arch/ia64/configs/sn2_defconfig       |   76 +++++++++++++++----------
 arch/ia64/ia32/binfmt_elf32.c         |    3 +
 arch/ia64/ia32/ia32_entry.S           |    2 -
 arch/ia64/kernel/mca_drv.c            |   54 ++++++++++++------
 arch/ia64/kernel/topology.c           |    7 +-
 arch/ia64/pci/pci.c                   |    3 -
 arch/ia64/sn/kernel/sn2/sn_hwperf.c   |    8 +--
 arch/ia64/sn/kernel/xpc_partition.c   |    8 +--
 arch/ia64/sn/pci/tioce_provider.c     |    6 +-
 arch/powerpc/platforms/powermac/pci.c |    2 -
 drivers/Kconfig                       |    2 -
 drivers/pci/msi.c                     |    4 +
 drivers/pci/quirks.c                  |    6 +-
 drivers/usb/gadget/net2280.c          |   15 +++--
 drivers/usb/host/ehci-pci.c           |    2 -
 drivers/usb/host/ohci-pci.c           |    2 -
 drivers/usb/host/uhci-hcd.c           |    2 -
 drivers/usb/serial/ftdi_sio.c         |    3 +
 drivers/usb/serial/ftdi_sio.h         |   13 ++++
 drivers/usb/serial/pl2303.c           |    1 
 drivers/usb/serial/pl2303.h           |    1 
 drivers/usb/serial/whiteheat.c        |    1 
 drivers/usb/storage/unusual_devs.h    |    9 +++
 drivers/video/fbsysfs.c               |   92 +------------------------------
 fs/splice.c                           |   99 ++++++++++++++++++++++-----------
 include/asm-i386/pgtable-2level.h     |    3 +
 include/asm-i386/pgtable-3level.h     |   20 +++++++
 include/asm-i386/pgtable.h            |    4 -
 include/asm-ia64/acpi.h               |    5 +-
 include/asm-ia64/machvec.h            |    2 +
 include/asm-ia64/sn/sn2/sn_hwperf.h   |    6 ++
 include/asm-ia64/sn/sn_sal.h          |   17 +++++-
 include/asm-ia64/thread_info.h        |    2 -
 include/asm-ia64/topology.h           |    5 ++
 include/linux/debugfs.h               |    5 +-
 include/linux/kobject.h               |    3 -
 include/linux/pagemap.h               |    2 +
 lib/kobject.c                         |    7 +-
 lib/kobject_uevent.c                  |    8 ++-
 mm/filemap.c                          |   32 +++++++++++
 44 files changed, 327 insertions(+), 233 deletions(-)

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