[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:       2009-01-30 10:44:10
Message-ID: S21366115AbZA3KoO/20090130104414Z+15517 () ftp ! linux-mips ! org
[Download RAW message or body]

Author: Ralf Baechle <ralf@linux-mips.org> Fri Jan 30 10:43:47 2009 +0000
Commit: 0963cc2489f9181b304a38ff343efaaea137b804
Gitweb: http://www.linux-mips.org/g/linux/0963cc24
Branch: master

---

 Documentation/Changes                       |    4 -
 Documentation/CodingStyle                   |   18 ++-
 Documentation/DMA-API.txt                   |    2 
 Documentation/DocBook/uio-howto.tmpl        |   88 +++++++++++++
 Documentation/IO-mapping.txt                |    4 -
 Documentation/block/biodoc.txt              |    5 -
 Documentation/cgroups/memcg_test.txt        |   24 +++-
 Documentation/filesystems/proc.txt          |   28 ++++
 Documentation/ja_JP/stable_kernel_rules.txt |   15 +-
 Documentation/lguest/Makefile               |    2 
 Documentation/usb/dma.txt                   |   11 +-
 arch/alpha/Kconfig                          |    1 
 arch/alpha/include/asm/bug.h                |   17 +-
 arch/alpha/include/asm/dma-mapping.h        |    2 
 arch/alpha/kernel/entry.S                   |    2 
 arch/alpha/kernel/osf_sys.c                 |  113 +++++++----------
 arch/alpha/kernel/pci-noop.c                |    3 
 arch/alpha/kernel/signal.c                  |   18 +--
 arch/alpha/kernel/smp.c                     |    3 
 arch/alpha/kernel/systbls.S                 |   52 ++++----
 arch/ia64/hp/common/sba_iommu.c             |   12 +-
 arch/parisc/include/asm/dma-mapping.h       |    2 
 arch/parisc/kernel/pci-dma.c                |    2 
 arch/x86/include/asm/dma-mapping.h          |    4 -
 arch/x86/kernel/pci-gart_64.c               |    2 
 arch/x86/lguest/boot.c                      |    4 -
 drivers/ata/sata_sil.c                      |    1 
 drivers/base/core.c                         |    2 
 drivers/firewire/fw-card.c                  |    4 -
 drivers/firewire/fw-device.c                |  123 +++++++++++++++---
 drivers/firewire/fw-device.h                |    1 
 drivers/firewire/fw-ohci.c                  |    6 -
 drivers/firewire/fw-sbp2.c                  |   89 +++++++------
 drivers/firewire/fw-topology.c              |   12 ++
 drivers/firewire/fw-transaction.h           |    9 +
 drivers/gpio/gpiolib.c                      |    1 
 drivers/gpu/drm/i915/intel_lvds.c           |    2 
 drivers/hid/hid-core.c                      |    4 +
 drivers/hid/hid-ids.h                       |    2 
 drivers/hid/hid-microsoft.c                 |   13 +-
 drivers/hid/usbhid/hiddev.c                 |    2 
 drivers/hwmon/applesmc.c                    |   30 ++++
 drivers/ieee1394/ieee1394.h                 |    4 -
 drivers/ieee1394/ieee1394_core.c            |   16 +-
 drivers/ieee1394/ohci1394.h                 |    2 
 drivers/ieee1394/sbp2.c                     |   54 +++++---
 drivers/lguest/core.c                       |    2 
 drivers/lguest/lguest_user.c                |    5 -
 drivers/misc/hpilo.c                        |    2 
 drivers/misc/sgi-xp/xpc_channel.c           |    3 
 drivers/misc/sgi-xp/xpc_sn2.c               |   34 +++--
 drivers/misc/sgi-xp/xpc_uv.c                |    2 
 drivers/mtd/ubi/Kconfig.debug               |   10 -
 drivers/mtd/ubi/build.c                     |   21 ++-
 drivers/mtd/ubi/cdev.c                      |  184 ++++++++++++++++++++-------
 drivers/mtd/ubi/gluebi.c                    |   11 --
 drivers/mtd/ubi/scan.c                      |    8 -
 drivers/mtd/ubi/ubi.h                       |   11 +-
 drivers/mtd/ubi/upd.c                       |   21 +--
 drivers/mtd/ubi/vmt.c                       |   17 +-
 drivers/parisc/sba_iommu.c                  |   18 +--
 drivers/platform/x86/hp-wmi.c               |    6 +
 drivers/staging/agnx/agnx.h                 |    2 
 drivers/staging/altpciechdma/altpciechdma.c |    4 -
 drivers/staging/android/binder.c            |   16 +-
 drivers/staging/android/lowmemorykiller.txt |   16 ++
 drivers/staging/android/timed_gpio.c        |    5 -
 drivers/staging/comedi/Kconfig              |    1 
 drivers/staging/meilhaus/Kconfig            |   21 ++-
 drivers/staging/poch/poch.c                 |    2 
 drivers/staging/usbip/usbip_common.c        |   16 ++
 drivers/video/Kconfig                       |    2 
 fs/cifs/CHANGES                             |    4 -
 fs/cifs/cifsencrypt.c                       |   18 +--
 fs/cifs/cifsproto.h                         |    4 -
 fs/cifs/connect.c                           |   24 ++--
 fs/cifs/dir.c                               |   56 +++++---
 fs/cifs/inode.c                             |    5 +
 fs/cifs/md5.c                               |   38 +++---
 fs/cifs/md5.h                               |    6 -
 fs/cifs/transport.c                         |  127 ++++++-------------
 fs/eventpoll.c                              |   22 +--
 include/linux/cgroup.h                      |    1 
 include/linux/kprobes.h                     |   47 ++++---
 include/linux/sched.h                       |    1 
 include/linux/syscalls.h                    |    5 +
 include/media/videobuf-dma-sg.h             |    2 
 include/mtd/ubi-user.h                      |  132 ++++++++++++++++---
 kernel/cgroup.c                             |   28 +++-
 mm/memcontrol.c                             |   25 +++-
 mm/mmap.c                                   |   26 +---
 mm/swapfile.c                               |    5 +
 sound/pci/hda/patch_conexant.c              |   14 ++
 sound/pci/hda/patch_realtek.c               |    1 
 sound/pci/hda/patch_sigmatel.c              |    2 
 sound/soc/codecs/wm8753.c                   |    9 +
 sound/soc/omap/omap-mcbsp.c                 |    4 +
 97 files changed, 1175 insertions(+), 686 deletions(-)

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