[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:       2008-05-14 10:09:44
Message-ID: S20035774AbYENKJt/20080514100949Z+647388 () ftp ! linux-mips ! org
[Download RAW message or body]

Author: Ralf Baechle <ralf@linux-mips.org> Wed May 14 11:06:30 2008 +0100
Commit: 1316027f277a736372c2a79889b7001552e2ecaa
Gitweb: http://www.linux-mips.org/g/linux/1316027f
Branch: master

---

 Documentation/cgroups.txt                   |    4 
 Documentation/hwmon/adt7473                 |    3 
 MAINTAINERS                                 |    4 
 arch/m68knommu/Kconfig                      |    3 
 arch/m68knommu/kernel/vmlinux.lds.S         |   10 
 arch/mn10300/boot/install.sh                |   16 -
 arch/parisc/mm/init.c                       |    2 
 arch/um/Kconfig.char                        |    6 
 arch/um/drivers/chan_user.c                 |    1 
 arch/um/drivers/cow_sys.h                   |    2 
 arch/um/drivers/daemon_user.c               |    4 
 arch/um/drivers/fd.c                        |    2 
 arch/um/drivers/hostaudio_kern.c            |    2 
 arch/um/drivers/mcast_user.c                |    3 
 arch/um/drivers/net_user.c                  |    2 
 arch/um/drivers/port_user.c                 |    2 
 arch/um/drivers/pty.c                       |    2 
 arch/um/drivers/random.c                    |  122 +++-
 arch/um/drivers/slip_user.c                 |    2 
 arch/um/drivers/tty.c                       |    2 
 arch/um/drivers/ubd_kern.c                  |    4 
 arch/um/drivers/xterm.c                     |    2 
 arch/um/include/as-layout.h                 |   14 
 arch/um/include/line.h                      |    4 
 arch/um/include/os.h                        |    1 
 arch/um/include/process.h                   |   20 -
 arch/um/include/skas_ptrace.h               |   13 
 arch/um/include/sysdep-i386/ptrace_user.h   |   30 -
 arch/um/include/sysdep-i386/sigcontext.h    |    2 
 arch/um/include/sysdep-x86_64/ptrace_user.h |   17 -
 arch/um/include/um_malloc.h                 |    9 
 arch/um/kernel/dyn.lds.S                    |    7 
 arch/um/kernel/mem.c                        |    5 
 arch/um/kernel/time.c                       |    4 
 arch/um/kernel/um_arch.c                    |    7 
 arch/um/kernel/uml.lds.S                    |    7 
 arch/um/os-Linux/drivers/ethertap_user.c    |    4 
 arch/um/os-Linux/helper.c                   |    4 
 arch/um/os-Linux/main.c                     |    2 
 arch/um/os-Linux/sigio.c                    |   39 +
 arch/um/os-Linux/signal.c                   |    1 
 arch/um/os-Linux/skas/process.c             |    2 
 arch/um/os-Linux/start_up.c                 |   81 +--
 arch/um/os-Linux/sys-i386/registers.c       |    5 
 arch/um/os-Linux/time.c                     |   54 ++
 arch/um/sys-i386/ptrace.c                   |   30 -
 arch/um/sys-i386/user-offsets.c             |    2 
 arch/um/sys-x86_64/user-offsets.c           |    1 
 arch/x86/kernel/pci-dma.c                   |    8 
 arch/x86/pci/i386.c                         |    4 
 block/blktrace.c                            |    2 
 block/compat_ioctl.c                        |    2 
 drivers/char/synclink_gt.c                  |    2 
 drivers/md/raid5.c                          |   25 -
 drivers/misc/sgi-xp/xp.h                    |  305 ++++------
 drivers/misc/sgi-xp/xp_main.c               |   44 +
 drivers/misc/sgi-xp/xpc.h                   |   83 +--
 drivers/misc/sgi-xp/xpc_channel.c           |  186 +++---
 drivers/misc/sgi-xp/xpc_main.c              |   60 +-
 drivers/misc/sgi-xp/xpc_partition.c         |   74 +--
 drivers/misc/sgi-xp/xpnet.c                 |   22 -
 drivers/mmc/host/sdhci.h                    |    2 
 drivers/pci/intel-iommu.c                   |    6 
 drivers/pci/pci-acpi.c                      |  109 +++-
 drivers/pci/quirks.c                        |    1 
 drivers/pnp/interface.c                     |    2 
 drivers/rtc/rtc-lib.c                       |    2 
 drivers/rtc/rtc-m41t80.c                    |    3 
 drivers/scsi/aha152x.c                      |    8 
 drivers/scsi/gdth.c                         |   51 +-
 drivers/scsi/libiscsi.c                     |   29 +
 drivers/scsi/qla1280.c                      |    4 
 drivers/spi/Kconfig                         |    1 
 drivers/spi/pxa2xx_spi.c                    |    2 
 drivers/spi/spi_mpc83xx.c                   |  411 ++++++++++----
 drivers/video/Kconfig                       |    1 
 drivers/video/atmel_lcdfb.c                 |   11 
 drivers/video/console/fbcon.c               |   31 +
 drivers/video/pnx4008/pnxrgbfb.c            |   11 
 drivers/video/tridentfb.c                   |   25 -
 fs/dquot.c                                  |   10 
 fs/ecryptfs/inode.c                         |   13 
 fs/ecryptfs/miscdev.c                       |    2 
 fs/exec.c                                   |    2 
 fs/ext4/mballoc.c                           |    6 
 fs/fuse/file.c                              |    2 
 fs/fuse/fuse_i.h                            |    3 
 fs/fuse/inode.c                             |    5 
 fs/hfsplus/inode.c                          |    2 
 fs/hppfs/Makefile                           |    6 
 fs/hppfs/hppfs.c                            |  771 ++++++++++++++++++++++++++
 fs/hppfs/hppfs_kern.c                       |  793 ---------------------------
 fs/jbd2/journal.c                           |    4 
 fs/proc/array.c                             |    1 
 fs/ufs/ufs.h                                |    1 
 include/asm-um/irq.h                        |    3 
 include/asm-um/keyboard.h                   |    6 
 include/asm-um/page.h                       |   17 -
 include/linux/bitmap.h                      |    1 
 include/linux/cpumask.h                     |    7 
 include/linux/fuse.h                        |    1 
 include/linux/mm_types.h                    |   13 
 include/sound/soc.h                         |    2 
 init/main.c                                 |   18 -
 lib/bitmap.c                                |   16 -
 mm/pdflush.c                                |    4 
 mm/vmstat.c                                 |    2 
 sound/soc/codecs/tlv320aic3x.c              |    4 
 sound/soc/fsl/fsl_ssi.c                     |    2 
 sound/soc/omap/n810.c                       |    4 
 sound/synth/emux/emux_synth.c               |    6 
 111 files changed, 1994 insertions(+), 1825 deletions(-)

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

Configure | About | News | Add a list | Sponsored by KoreLogic