Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2026-09-28 19:20:30 +00:00 · 2009-03-24 14:25:34 -05:00 · 2009-03-24 14:25:34 -05:00 · 61454f3338
commit 61454f3338
parent 4740cd8b4f 8e0ee43bc2
216 changed files with 17417 additions and 18925 deletions
--- a/2
+++ b/2
--- a/Documentation/filesystems/ext2.txt
+++ b/Documentation/filesystems/ext2.txt
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/Documentation/logo.gif
+++ b/Documentation/logo.gif
--- a/Documentation/logo.svg
+++ b/Documentation/logo.svg
--- a/Documentation/logo.txt
+++ b/Documentation/logo.txt
--- a/9
+++ b/9
--- a/10
+++ b/10
--- a/arch/m68k/include/asm/param.h
+++ b/arch/m68k/include/asm/param.h
--- a/arch/m68k/include/asm/param_mm.h
+++ b/arch/m68k/include/asm/param_mm.h
--- a/arch/m68k/include/asm/param_no.h
+++ b/arch/m68k/include/asm/param_no.h
--- a/arch/m68k/include/asm/ptrace.h
+++ b/arch/m68k/include/asm/ptrace.h
--- a/arch/m68k/include/asm/ptrace_mm.h
+++ b/arch/m68k/include/asm/ptrace_mm.h
--- a/arch/m68k/include/asm/ptrace_no.h
+++ b/arch/m68k/include/asm/ptrace_no.h
--- a/arch/m68k/include/asm/setup.h
+++ b/arch/m68k/include/asm/setup.h
--- a/arch/m68k/include/asm/setup_mm.h
+++ b/arch/m68k/include/asm/setup_mm.h
--- a/arch/m68k/include/asm/setup_no.h
+++ b/arch/m68k/include/asm/setup_no.h
--- a/arch/m68k/include/asm/sigcontext.h
+++ b/arch/m68k/include/asm/sigcontext.h
--- a/arch/m68k/include/asm/sigcontext_mm.h
+++ b/arch/m68k/include/asm/sigcontext_mm.h
--- a/arch/m68k/include/asm/sigcontext_no.h
+++ b/arch/m68k/include/asm/sigcontext_no.h
--- a/arch/m68k/include/asm/siginfo.h
+++ b/arch/m68k/include/asm/siginfo.h
--- a/arch/m68k/include/asm/siginfo_mm.h
+++ b/arch/m68k/include/asm/siginfo_mm.h
--- a/arch/m68k/include/asm/siginfo_no.h
+++ b/arch/m68k/include/asm/siginfo_no.h
--- a/arch/m68k/include/asm/signal.h
+++ b/arch/m68k/include/asm/signal.h
--- a/arch/m68k/include/asm/signal_mm.h
+++ b/arch/m68k/include/asm/signal_mm.h
--- a/arch/m68k/include/asm/signal_no.h
+++ b/arch/m68k/include/asm/signal_no.h
--- a/arch/m68k/include/asm/swab.h
+++ b/arch/m68k/include/asm/swab.h
--- a/arch/m68k/include/asm/swab_mm.h
+++ b/arch/m68k/include/asm/swab_mm.h
--- a/arch/m68k/include/asm/swab_no.h
+++ b/arch/m68k/include/asm/swab_no.h
--- a/arch/m68k/include/asm/unistd.h
+++ b/arch/m68k/include/asm/unistd.h
--- a/arch/m68k/include/asm/unistd_mm.h
+++ b/arch/m68k/include/asm/unistd_mm.h
--- a/arch/m68k/include/asm/unistd_no.h
+++ b/arch/m68k/include/asm/unistd_no.h
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
--- a/arch/powerpc/include/asm/cputable.h
+++ b/arch/powerpc/include/asm/cputable.h
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
--- a/arch/powerpc/platforms/ps3/Kconfig
+++ b/arch/powerpc/platforms/ps3/Kconfig
--- a/arch/s390/include/asm/mman.h
+++ b/arch/s390/include/asm/mman.h
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
--- a/arch/s390/include/asm/topology.h
+++ b/arch/s390/include/asm/topology.h
--- a/arch/s390/kernel/mcount.S
+++ b/arch/s390/kernel/mcount.S
--- a/arch/s390/lib/div64.c
+++ b/arch/s390/lib/div64.c
--- a/arch/s390/lib/uaccess_pt.c
+++ b/arch/s390/lib/uaccess_pt.c
--- a/arch/s390/mm/mmap.c
+++ b/arch/s390/mm/mmap.c
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
--- a/arch/sparc/include/asm/pil.h
+++ b/arch/sparc/include/asm/pil.h
--- a/arch/sparc/kernel/kgdb_64.c
+++ b/arch/sparc/kernel/kgdb_64.c
--- a/arch/sparc/kernel/pci_common.c
+++ b/arch/sparc/kernel/pci_common.c
--- a/arch/sparc/kernel/ttable.S
+++ b/arch/sparc/kernel/ttable.S
--- a/arch/sparc/mm/ultra.S
+++ b/arch/sparc/mm/ultra.S
--- a/arch/x86/kernel/kprobes.c
+++ b/arch/x86/kernel/kprobes.c
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
--- a/drivers/block/ps3vram.c
+++ b/drivers/block/ps3vram.c
--- a/drivers/dca/dca-sysfs.c
+++ b/drivers/dca/dca-sysfs.c
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
--- a/drivers/md/dm-io.c
+++ b/drivers/md/dm-io.c
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
--- a/drivers/mtd/devices/Kconfig
+++ b/drivers/mtd/devices/Kconfig
--- a/drivers/mtd/devices/Makefile
+++ b/drivers/mtd/devices/Makefile
--- a/drivers/mtd/devices/ps3vram.c
+++ b/drivers/mtd/devices/ps3vram.c
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
--- a/drivers/net/benet/Kconfig
+++ b/drivers/net/benet/Kconfig
--- a/drivers/net/benet/Makefile
+++ b/drivers/net/benet/Makefile
--- a/drivers/net/benet/be.h
+++ b/drivers/net/benet/be.h
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
--- a/drivers/net/benet/be_cmds.h
+++ b/drivers/net/benet/be_cmds.h
--- a/drivers/net/benet/be_ethtool.c
+++ b/drivers/net/benet/be_ethtool.c
--- a/drivers/net/benet/be_hw.h
+++ b/drivers/net/benet/be_hw.h
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
--- a/drivers/net/bnx2x.h
+++ b/drivers/net/bnx2x.h
--- a/drivers/net/bnx2x_init.h
+++ b/drivers/net/bnx2x_init.h
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
--- a/drivers/net/dnet.h
+++ b/drivers/net/dnet.h
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
--- a/drivers/net/qlge/qlge.h
+++ b/drivers/net/qlge/qlge.h
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
--- a/drivers/net/sh_eth.h
+++ b/drivers/net/sh_eth.h
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
--- a/Show more
+++ b/Show more