[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-08-20 13:11:31
Message-ID: S20037798AbWHTNLg/20060820131136Z+1816 () ftp ! linux-mips ! org
[Download RAW message or body]
Author: Ralf Baechle <ralf@linux-mips.org> Sun Aug 20 14:10:39 2006 +0100
Commit: 23b2e79ef476597297d8e5278d27108cca45ae4e
Gitweb: http://www.linux-mips.org/g/linux/23b2e79e
Branch: master
---
Documentation/fb/imacfb.txt | 31 ++
Documentation/kobject.txt | 2
Documentation/networking/ip-sysctl.txt | 6
Documentation/powerpc/booting-without-of.txt | 10 -
MAINTAINERS | 8
Makefile | 32 +-
arch/arm/common/rtctime.c | 1
arch/arm/kernel/traps.c | 2
arch/arm/mach-ixp4xx/common-pci.c | 2
arch/arm/mach-ixp4xx/gtwx5715-setup.c | 7
arch/i386/kernel/traps.c | 2
arch/ia64/kernel/traps.c | 2
arch/powerpc/Kconfig | 7
arch/powerpc/boot/dts/mpc8641_hpcn.dts | 339 ++++++++++++++++++++
arch/powerpc/configs/g5_defconfig | 122 ++++++-
arch/powerpc/configs/iseries_defconfig | 78 ++++-
arch/powerpc/configs/pseries_defconfig | 78 ++++-
arch/powerpc/kernel/Makefile | 4
arch/powerpc/kernel/cpu_setup_power4.S | 2
arch/powerpc/kernel/crash.c | 11 +
arch/powerpc/kernel/irq.c | 2
arch/powerpc/kernel/kprobes.c | 2
arch/powerpc/kernel/machine_kexec.c | 56 +++
arch/powerpc/kernel/machine_kexec_64.c | 57 ---
arch/powerpc/kernel/rtas.c | 21 +
arch/powerpc/kernel/traps.c | 18 +
arch/powerpc/platforms/pseries/setup.c | 2
arch/powerpc/platforms/pseries/xics.c | 6
arch/powerpc/sysdev/fsl_soc.c | 12 +
arch/s390/appldata/appldata_base.c | 2
arch/s390/mm/init.c | 6
arch/x86_64/kernel/traps.c | 2
arch/xtensa/kernel/traps.c | 2
drivers/char/watchdog/Kconfig | 8
drivers/ide/pci/generic.c | 30 ++
drivers/md/dm-mpath.c | 3
drivers/media/dvb/bt8xx/dst.c | 58 ++--
drivers/media/dvb/dvb-core/Makefile | 6
drivers/media/radio/Kconfig | 12 +
drivers/media/radio/Makefile | 1
drivers/media/radio/dsbr100.c | 430 ++++++++++++++++++++++++++
drivers/media/video/Kconfig | 12 -
drivers/media/video/Makefile | 2
drivers/media/video/compat_ioctl32.c | 32 ++
drivers/media/video/cx25840/cx25840-core.c | 4
drivers/media/video/cx88/cx88-video.c | 4
drivers/media/video/dsbr100.c | 430 --------------------------
drivers/media/video/msp3400-kthreads.c | 4
drivers/media/video/pwc/Kconfig | 2
drivers/media/video/pwc/pwc-if.c | 1
drivers/media/video/saa7134/saa7134-video.c | 2
drivers/media/video/tuner-types.c | 14 -
drivers/media/video/v4l1-compat.c | 4
drivers/media/video/v4l2-common.c | 6
drivers/media/video/videodev.c | 2
drivers/media/video/vivi.c | 4
drivers/mmc/mmc_queue.c | 3
drivers/mmc/wbsd.c | 9 -
drivers/net/bnx2.c | 49 ++-
drivers/net/bnx2.h | 12 -
drivers/net/myri10ge/myri10ge.c | 2
drivers/net/ppp_generic.c | 30 +-
drivers/net/tg3.c | 51 ++-
drivers/net/tg3.h | 8
drivers/pci/hotplug/Kconfig | 7
drivers/pci/hotplug/pciehp.h | 5
drivers/pci/hotplug/pciehp_hpc.c | 4
drivers/s390/block/dasd.c | 2
drivers/s390/block/dasd_devmap.c | 84 ++---
drivers/s390/block/dasd_eckd.c | 8
drivers/s390/block/xpram.c | 25 --
drivers/s390/char/tape_class.c | 2
drivers/s390/cio/device_fsm.c | 1
drivers/s390/cio/device_ops.c | 3
drivers/scsi/arm/Kconfig | 3
drivers/scsi/arm/scsi.h | 2
drivers/scsi/ata_piix.c | 5
drivers/scsi/libata-core.c | 34 --
drivers/scsi/libata-scsi.c | 13 +
drivers/scsi/sata_sil24.c | 1
drivers/usb/host/ohci-au1xxx.c | 1
drivers/usb/input/appletouch.c | 2
drivers/usb/misc/usbtest.c | 5
drivers/usb/serial/ftdi_sio.c | 2
drivers/usb/serial/ftdi_sio.h | 6
drivers/usb/serial/ipaq.c | 2
drivers/usb/storage/unusual_devs.h | 10 +
drivers/video/Kconfig | 2
drivers/video/imacfb.c | 49 +++
fs/adfs/super.c | 2
fs/fuse/file.c | 10 -
fs/jfs/inode.c | 16 -
fs/jfs/jfs_inode.h | 1
fs/jfs/super.c | 118 +++++++
fs/locks.c | 6
fs/ocfs2/dlm/dlmmaster.c | 1
fs/ocfs2/dlm/dlmunlock.c | 43 +--
fs/ocfs2/localalloc.c | 8
fs/ocfs2/ocfs2.h | 2
fs/ocfs2/suballoc.c | 261 ++++++++++++++--
fs/ocfs2/suballoc.h | 2
fs/ocfs2/super.c | 8
fs/udf/super.c | 7
fs/xfs/xfs_alloc.c | 103 +++---
include/asm-powerpc/kexec.h | 3
include/asm-powerpc/rtas.h | 1
include/linux/fb.h | 2
include/linux/if_vlan.h | 5
include/linux/kernel.h | 1
include/linux/mm.h | 1
include/linux/netdevice.h | 27 ++
include/linux/skbuff.h | 19 +
include/media/v4l2-dev.h | 2
kernel/futex.c | 16 +
kernel/hrtimer.c | 2
kernel/panic.c | 1
kernel/timer.c | 41 --
kernel/workqueue.c | 33 +-
mm/swap.c | 20 +
net/atm/proc.c | 2
net/bridge/br_if.c | 7
net/bridge/netfilter/ebt_ulog.c | 3
net/core/dev.c | 37 +-
net/core/dst.c | 3
net/core/pktgen.c | 4
net/core/rtnetlink.c | 15 +
net/core/skbuff.c | 4
net/core/utils.c | 7
net/core/wireless.c | 24 +
net/ipv4/fib_semantics.c | 12 -
net/ipv4/igmp.c | 38 +-
net/ipv4/ip_output.c | 4
net/ipv4/netfilter/arp_tables.c | 27 +-
net/ipv4/netfilter/ip_conntrack_netlink.c | 17 -
net/ipv4/netfilter/ip_tables.c | 36 ++
net/ipv4/netfilter/ipt_ULOG.c | 5
net/ipv4/netfilter/ipt_hashlimit.c | 11 -
net/ipv4/route.c | 2
net/ipv4/tcp_output.c | 12 +
net/ipv4/tcp_probe.c | 3
net/ipv6/addrconf.c | 4
net/ipv6/icmp.c | 13 +
net/ipv6/ip6_output.c | 2
net/ipv6/mcast.c | 10 -
net/ipv6/netfilter/ip6_tables.c | 34 ++
net/ipx/af_ipx.c | 10 -
net/llc/llc_sap.c | 3
net/netfilter/nf_conntrack_netlink.c | 17 -
net/netfilter/nfnetlink_log.c | 3
net/netfilter/xt_physdev.c | 1
net/netfilter/xt_string.c | 2
net/sched/cls_u32.c | 2
net/xfrm/xfrm_policy.c | 27 +-
scripts/mod/file2alias.c | 2
sound/oss/Kconfig | 6
sound/pci/Kconfig | 70 ++--
usr/Makefile | 3
157 files changed, 2464 insertions(+), 1227 deletions(-)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic