[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-06-28 9:19:52
Message-ID: S3686495AbWF1JT6/20060628091958Z+4731 () ftp ! linux-mips ! org
[Download RAW message or body]
Author: Ralf Baechle <ralf@linux-mips.org> Wed Jun 28 09:50:58 2006 +0100
Commit: 82c651635da55aabff2682a2e3f2489460cd3fb4
Gitweb: http://www.linux-mips.org/g/linux/82c65163
Branch: master
---
Documentation/RCU/torture.txt | 34
Documentation/kernel-parameters.txt | 4
Documentation/pi-futex.txt | 121 +
Documentation/robust-futexes.txt | 2
Documentation/rt-mutex-design.txt | 781 +++++
Documentation/rt-mutex.txt | 79 +
Documentation/video4linux/README.pvrusb2 | 212 +
arch/alpha/kernel/setup.c | 2
arch/arm/kernel/setup.c | 2
arch/i386/Kconfig | 15
arch/i386/kernel/asm-offsets.c | 4
arch/i386/kernel/cpu/amd.c | 6
arch/i386/kernel/cpu/common.c | 25
arch/i386/kernel/cpu/intel_cacheinfo.c | 16
arch/i386/kernel/cpu/proc.c | 8
arch/i386/kernel/cpuid.c | 2
arch/i386/kernel/entry.S | 22
arch/i386/kernel/irq.c | 8
arch/i386/kernel/msr.c | 2
arch/i386/kernel/scx200.c | 66
arch/i386/kernel/signal.c | 4
arch/i386/kernel/smpboot.c | 37
arch/i386/kernel/sysenter.c | 128 +
arch/i386/kernel/topology.c | 28
arch/i386/kernel/vsyscall-sysenter.S | 4
arch/i386/kernel/vsyscall.lds.S | 4
arch/i386/mach-voyager/setup.c | 5
arch/i386/mach-voyager/voyager_smp.c | 2
arch/i386/mm/init.c | 5
arch/i386/mm/pageattr.c | 4
arch/ia64/Kconfig | 4
arch/ia64/kernel/palinfo.c | 4
arch/ia64/kernel/salinfo.c | 6
arch/ia64/kernel/topology.c | 32
arch/ia64/mm/discontig.c | 57
arch/ia64/mm/init.c | 5
arch/ia64/sn/kernel/irq.c | 2
arch/m32r/kernel/setup.c | 2
arch/m68knommu/Makefile | 24
arch/m68knommu/defconfig | 207 +
arch/m68knommu/platform/68328/head-rom.S | 18
arch/m68knommu/platform/68360/head-ram.S | 19
arch/m68knommu/platform/68360/head-rom.S | 17
arch/mips/kernel/smp.c | 2
arch/mips/kernel/smtc.c | 4
arch/parisc/kernel/topology.c | 3
arch/powerpc/kernel/setup_32.c | 2
arch/powerpc/kernel/sysfs.c | 31
arch/powerpc/mm/init_64.c | 3
arch/powerpc/mm/mem.c | 11
arch/powerpc/mm/numa.c | 11
arch/powerpc/platforms/cell/spufs/switch.c | 2
arch/powerpc/platforms/powermac/pfunc_core.c | 2
arch/powerpc/platforms/pseries/eeh_event.c | 2
arch/powerpc/sysdev/mmio_nvram.c | 2
arch/ppc/kernel/setup.c | 2
arch/s390/appldata/appldata_base.c | 2
arch/s390/kernel/smp.c | 2
arch/sh/kernel/setup.c | 2
arch/sh64/kernel/setup.c | 2
arch/sparc64/kernel/setup.c | 2
arch/sparc64/mm/init.c | 3
arch/x86_64/kernel/entry.S | 2
arch/x86_64/kernel/irq.c | 4
arch/x86_64/kernel/mce.c | 4
arch/x86_64/kernel/smp.c | 4
arch/x86_64/kernel/smpboot.c | 8
arch/x86_64/mm/init.c | 73
arch/xtensa/kernel/time.c | 2
arch/xtensa/kernel/traps.c | 2
block/ll_rw_blk.c | 6
drivers/acpi/Kconfig | 2
drivers/acpi/acpi_memhotplug.c | 146 +
drivers/acpi/numa.c | 15
drivers/atm/firestream.c | 3
drivers/base/cpu.c | 28
drivers/base/dmapool.c | 3
drivers/base/memory.c | 4
drivers/base/node.c | 61
drivers/base/topology.c | 4
drivers/char/Kconfig | 23
drivers/char/Makefile | 2
drivers/char/agp/sgi-agp.c | 5
drivers/char/drm/drm_memory_debug.h | 2
drivers/char/drm/via_dmablit.c | 2
drivers/char/epca.c | 2
drivers/char/hvcs.c | 11
drivers/char/ipmi/ipmi_msghandler.c | 3
drivers/char/ipmi/ipmi_si_intf.c | 2
drivers/char/moxa.c | 2
drivers/char/nsc_gpio.c | 142 +
drivers/char/pc8736x_gpio.c | 340 ++
drivers/char/scx200_gpio.c | 162 +
drivers/char/specialix.c | 2
drivers/char/stallion.c | 208 +
drivers/char/sx.c | 2
drivers/char/tty_io.c | 7
drivers/cpufreq/cpufreq.c | 8
drivers/cpufreq/cpufreq_stats.c | 4
drivers/i2c/busses/i2c-i801.c | 16
drivers/ide/pci/amd74xx.c | 7
drivers/input/input.c | 3
drivers/isdn/gigaset/common.c | 2
drivers/isdn/i4l/isdn_tty.c | 2
drivers/leds/led-core.c | 2
drivers/leds/led-triggers.c | 2
drivers/media/video/Kconfig | 2
drivers/media/video/Makefile | 1
drivers/media/video/cx2341x.c | 40
drivers/media/video/cx88/cx88-blackbird.c | 13
drivers/media/video/pvrusb2/Kconfig | 62
drivers/media/video/pvrusb2/Makefile | 18
drivers/media/video/pvrusb2/pvrusb2-audio.c | 204 +
drivers/media/video/pvrusb2/pvrusb2-audio.h | 40
drivers/media/video/pvrusb2/pvrusb2-context.c | 230 +
drivers/media/video/pvrusb2/pvrusb2-context.h | 92 +
drivers/media/video/pvrusb2/pvrusb2-ctrl.c | 593 ++++
drivers/media/video/pvrusb2/pvrusb2-ctrl.h | 123 +
drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | 279 ++
drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h | 53
drivers/media/video/pvrusb2/pvrusb2-debug.h | 67
drivers/media/video/pvrusb2/pvrusb2-debugifc.c | 478 +++
drivers/media/video/pvrusb2/pvrusb2-debugifc.h | 53
drivers/media/video/pvrusb2/pvrusb2-demod.c | 126 +
drivers/media/video/pvrusb2/pvrusb2-demod.h | 38
drivers/media/video/pvrusb2/pvrusb2-eeprom.c | 164 +
drivers/media/video/pvrusb2/pvrusb2-eeprom.h | 40
drivers/media/video/pvrusb2/pvrusb2-encoder.c | 418 +++
drivers/media/video/pvrusb2/pvrusb2-encoder.h | 42
drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 384 ++
drivers/media/video/pvrusb2/pvrusb2-hdw.c | 3120 ++++++++++++++++++++
drivers/media/video/pvrusb2/pvrusb2-hdw.h | 335 ++
.../media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c | 115 +
drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c | 232 +
drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h | 47
drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 937 ++++++
drivers/media/video/pvrusb2/pvrusb2-i2c-core.h | 96 +
drivers/media/video/pvrusb2/pvrusb2-io.c | 695 ++++
drivers/media/video/pvrusb2/pvrusb2-io.h | 102 +
drivers/media/video/pvrusb2/pvrusb2-ioread.c | 513 +++
drivers/media/video/pvrusb2/pvrusb2-ioread.h | 50
drivers/media/video/pvrusb2/pvrusb2-main.c | 172 +
drivers/media/video/pvrusb2/pvrusb2-std.c | 408 +++
drivers/media/video/pvrusb2/pvrusb2-std.h | 60
drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 865 ++++++
drivers/media/video/pvrusb2/pvrusb2-sysfs.h | 47
drivers/media/video/pvrusb2/pvrusb2-tuner.c | 122 +
drivers/media/video/pvrusb2/pvrusb2-tuner.h | 38
drivers/media/video/pvrusb2/pvrusb2-util.h | 63
drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 1126 +++++++
drivers/media/video/pvrusb2/pvrusb2-v4l2.h | 40
drivers/media/video/pvrusb2/pvrusb2-video-v4l.c | 253 ++
drivers/media/video/pvrusb2/pvrusb2-video-v4l.h | 52
drivers/media/video/pvrusb2/pvrusb2-wm8775.c | 170 +
drivers/media/video/pvrusb2/pvrusb2-wm8775.h | 53
drivers/media/video/pvrusb2/pvrusb2.h | 43
drivers/media/video/saa7134/saa6752hs.c | 4
drivers/media/video/stradis.c | 4
drivers/media/video/tda9887.c | 31
drivers/media/video/tuner-core.c | 8
drivers/media/video/v4l2-common.c | 2
drivers/message/fusion/mptfc.c | 6
drivers/message/fusion/mptsas.c | 3
drivers/message/i2o/iop.c | 1
drivers/misc/ibmasm/module.c | 2
drivers/mtd/chips/cfi_cmdset_0001.c | 1
drivers/mtd/chips/jedec.c | 1
drivers/mtd/chips/map_absent.c | 3
drivers/mtd/chips/map_ram.c | 1
drivers/mtd/chips/map_rom.c | 1
drivers/mtd/devices/block2mtd.c | 1
drivers/mtd/devices/ms02-nv.c | 1
drivers/mtd/devices/mtd_dataflash.c | 1
drivers/mtd/devices/phram.c | 1
drivers/mtd/devices/pmc551.c | 3
drivers/mtd/devices/slram.c | 1
drivers/mtd/maps/ixp2000.c | 2
drivers/mtd/maps/physmap.c | 2
drivers/mtd/mtdchar.c | 2
drivers/mtd/nand/nand_base.c | 16
drivers/mtd/nand/ndfc.c | 6
drivers/mtd/nand/s3c2410.c | 164 +
drivers/mtd/nand/ts7250.c | 2
drivers/net/3c59x.c | 79 -
drivers/net/dl2k.h | 12
drivers/net/dm9000.c | 34
drivers/net/eepro100.c | 5
drivers/net/epic100.c | 20
drivers/net/fealnx.c | 10
drivers/net/fec.c | 310 ++
drivers/net/fs_enet/fs_enet-mii.c | 3
drivers/net/hamradio/dmascc.c | 2
drivers/net/natsemi.c | 100 -
drivers/net/pcnet32.c | 6
drivers/net/phy/lxt.c | 8
drivers/net/tulip/winbond-840.c | 26
drivers/net/wan/c101.c | 2
drivers/net/wan/n2.c | 2
drivers/net/wan/pci200syn.c | 2
drivers/net/wireless/ipw2200.c | 22
drivers/net/yellowfin.c | 24
drivers/pcmcia/m8xx_pcmcia.c | 4
drivers/rapidio/rio-access.c | 4
drivers/rtc/class.c | 2
drivers/rtc/rtc-ds1553.c | 2
drivers/rtc/rtc-sa1100.c | 2
drivers/rtc/rtc-vr41xx.c | 2
drivers/s390/block/dasd_eer.c | 2
drivers/scsi/Kconfig | 2
drivers/scsi/ahci.c | 2
drivers/scsi/ata_piix.c | 2
drivers/scsi/libata-core.c | 153 +
drivers/scsi/libata-eh.c | 63
drivers/scsi/libata-scsi.c | 4
drivers/scsi/libata.h | 4
drivers/scsi/sata_nv.c | 2
drivers/scsi/sata_sil.c | 31
drivers/scsi/sata_sil24.c | 2
drivers/scsi/sata_svw.c | 2
drivers/scsi/sata_uli.c | 2
drivers/scsi/sata_via.c | 2
drivers/scsi/sata_vsc.c | 12
drivers/sn/ioc3.c | 2
drivers/video/au1100fb.c | 3
drivers/video/backlight/hp680_bl.c | 2
fs/Kconfig | 42
fs/buffer.c | 3
fs/cifs/CHANGES | 17
fs/cifs/Makefile | 2
fs/cifs/README | 39
fs/cifs/asn1.c | 10
fs/cifs/cifs_debug.c | 134 +
fs/cifs/cifs_debug.h | 4
fs/cifs/cifs_unicode.c | 1
fs/cifs/cifsencrypt.c | 140 +
fs/cifs/cifsfs.c | 6
fs/cifs/cifsfs.h | 3
fs/cifs/cifsglob.h | 71
fs/cifs/cifspdu.h | 98 +
fs/cifs/cifsproto.h | 14
fs/cifs/cifssmb.c | 287 +-
fs/cifs/connect.c | 498 +--
fs/cifs/dir.c | 15
fs/cifs/fcntl.c | 4
fs/cifs/file.c | 52
fs/cifs/inode.c | 39
fs/cifs/link.c | 7
fs/cifs/misc.c | 10
fs/cifs/netmisc.c | 4
fs/cifs/ntlmssp.c | 143 -
fs/cifs/readdir.c | 184 +
fs/cifs/sess.c | 538 +++
fs/cifs/smbencrypt.c | 1
fs/cifs/transport.c | 3
fs/jbd/journal.c | 3
fs/jffs2/acl.c | 2
fs/jffs2/erase.c | 19
fs/jffs2/fs.c | 2
fs/jffs2/gc.c | 6
fs/jffs2/jffs2_fs_sb.h | 3
fs/jffs2/malloc.c | 2
fs/jffs2/nodelist.c | 3
fs/jffs2/nodemgmt.c | 21
fs/jffs2/readinode.c | 1
fs/jffs2/scan.c | 55
fs/jffs2/summary.c | 41
fs/jffs2/xattr.c | 632 ++--
fs/jffs2/xattr.h | 21
fs/nfs/direct.c | 2
fs/nfs/inode.c | 2
fs/nfs/internal.h | 8
fs/nfs/pagelist.c | 2
fs/nfs/read.c | 2
fs/nfs/write.c | 2
fs/nfsd/nfs4state.c | 2
fs/ocfs2/cluster/heartbeat.c | 2
fs/ocfs2/cluster/tcp.c | 2
fs/ocfs2/dlm/dlmdomain.c | 2
fs/ocfs2/dlm/dlmlock.c | 2
fs/ocfs2/dlm/dlmrecovery.c | 4
fs/ocfs2/dlmglue.c | 2
fs/ocfs2/journal.c | 2
fs/ocfs2/vote.c | 8
fs/proc/task_mmu.c | 30
fs/ufs/inode.c | 111 -
fs/xfs/linux-2.6/xfs_iops.c | 9
fs/xfs/linux-2.6/xfs_linux.h | 2
fs/xfs/linux-2.6/xfs_vnode.h | 2
fs/xfs/xfs_behavior.h | 3
fs/xfs/xfs_inode.c | 4
fs/xfs/xfs_log.c | 4
fs/xfs/xfs_log_recover.c | 2
fs/xfs/xfs_mount.c | 21
fs/xfs/xfs_rtalloc.c | 2
fs/xfs/xfs_trans.h | 4
fs/xfs/xfs_vnodeops.c | 11
include/asm-alpha/core_t2.h | 2
include/asm-arm/arch-s3c2410/regs-nand.h | 48
include/asm-generic/bug.h | 6
include/asm-i386/cpu.h | 2
include/asm-i386/elf.h | 53
include/asm-i386/fixmap.h | 10
include/asm-i386/mmu.h | 1
include/asm-i386/node.h | 29
include/asm-i386/page.h | 3
include/asm-i386/processor.h | 8
include/asm-i386/thread_info.h | 11
include/asm-i386/topology.h | 11
include/asm-i386/unwind.h | 4
include/asm-ia64/nodedata.h | 12
include/asm-ia64/topology.h | 1
include/asm-m68knommu/ptrace.h | 2
include/asm-powerpc/topology.h | 5
include/asm-sparc64/topology.h | 3
include/asm-x86_64/hw_irq.h | 2
include/asm-x86_64/topology.h | 2
include/linux/acpi.h | 6
include/linux/buffer_head.h | 2
include/linux/cpu.h | 14
include/linux/dmaengine.h | 2
include/linux/futex.h | 12
include/linux/init_task.h | 3
include/linux/ioport.h | 3
include/linux/ipmi.h | 4
include/linux/jffs2.h | 1
include/linux/libata.h | 15
include/linux/list.h | 9
include/linux/memory_hotplug.h | 73
include/linux/mm.h | 13
include/linux/node.h | 17
include/linux/nsc_gpio.h | 42
include/linux/pci_ids.h | 2
include/linux/plist.h | 247 ++
include/linux/poison.h | 58
include/linux/rcupdate.h | 1
include/linux/rtmutex.h | 117 +
include/linux/sched.h | 59
include/linux/scx200.h | 7
include/linux/scx200_gpio.h | 21
include/linux/swap.h | 2
include/linux/syscalls.h | 4
include/linux/sysctl.h | 2
include/linux/topology.h | 3
include/media/cx2341x.h | 4
init/Kconfig | 5
init/main.c | 2
kernel/Makefile | 3
kernel/acct.c | 3
kernel/audit.c | 2
kernel/auditsc.c | 10
kernel/cpu.c | 8
kernel/exit.c | 9
kernel/fork.c | 19
kernel/futex.c | 1067 ++++++-
kernel/futex_compat.c | 14
kernel/hrtimer.c | 4
kernel/mutex-debug.c | 5
kernel/power/Kconfig | 13
kernel/profile.c | 2
kernel/rcupdate.c | 14
kernel/rcutorture.c | 201 +
kernel/resource.c | 38
kernel/rtmutex-debug.c | 513 +++
kernel/rtmutex-debug.h | 37
kernel/rtmutex-tester.c | 440 +++
kernel/rtmutex.c | 990 ++++++
kernel/rtmutex.h | 29
kernel/rtmutex_common.h | 123 +
kernel/sched.c | 1199 +++++---
kernel/softirq.c | 4
kernel/softlockup.c | 4
kernel/sysctl.c | 27
kernel/timer.c | 4
kernel/workqueue.c | 2
lib/Kconfig | 6
lib/Kconfig.debug | 18
lib/Makefile | 1
lib/plist.c | 118 +
lib/zlib_inflate/inffast.c | 6
lib/zlib_inflate/inftrees.c | 9
mm/Kconfig | 1
mm/filemap.c | 18
mm/memory_hotplug.c | 126 +
mm/page-writeback.c | 4
mm/page_alloc.c | 8
mm/slab.c | 21
mm/sparse.c | 2
mm/vmscan.c | 39
net/ipv6/route.c | 2
net/sunrpc/auth_gss/gss_krb5_seal.c | 2
net/tipc/bcast.c | 4
net/tipc/bearer.c | 2
net/tipc/config.c | 2
net/tipc/dbg.c | 2
net/tipc/handler.c | 2
net/tipc/name_table.c | 4
net/tipc/net.c | 2
net/tipc/node.c | 2
net/tipc/port.c | 4
net/tipc/ref.c | 4
net/tipc/subscr.c | 2
net/tipc/user_reg.c | 2
scripts/rt-tester/check-all.sh | 22
scripts/rt-tester/rt-tester.py | 222 +
scripts/rt-tester/t2-l1-2rt-sameprio.tst | 99 +
scripts/rt-tester/t2-l1-pi.tst | 82 +
scripts/rt-tester/t2-l1-signal.tst | 77
scripts/rt-tester/t2-l2-2rt-deadlock.tst | 89 +
scripts/rt-tester/t3-l1-pi-1rt.tst | 92 +
scripts/rt-tester/t3-l1-pi-2rt.tst | 93 +
scripts/rt-tester/t3-l1-pi-3rt.tst | 92 +
scripts/rt-tester/t3-l1-pi-signal.tst | 98 +
scripts/rt-tester/t3-l1-pi-steal.tst | 96 +
scripts/rt-tester/t3-l2-pi.tst | 92 +
scripts/rt-tester/t4-l2-pi-deboost.tst | 123 +
.../rt-tester/t5-l4-pi-boost-deboost-setsched.tst | 183 +
scripts/rt-tester/t5-l4-pi-boost-deboost.tst | 143 +
security/keys/key.c | 3
security/selinux/hooks.c | 6
sound/oss/via82cxxx_audio.c | 5
sound/ppc/toonie.c | 0
421 files changed, 25901 insertions(+), 3319 deletions(-)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic