1. 19 Feb, 2007 20 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · 2aa6eb31
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
        [WATCHDOG] machzwd warning fix
      2aa6eb31
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · cb553c48
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
        [MIPS] Update defconfigs
        [MIPS] Support for several more SNI RM models.
        [MIPS] Include <asm/bugs> to for declaration of check_bugs32.
        [MIPS] Add external declaration of pagetable_init() to pgalloc.h
        [MIPS] Make kernel_thread_helper() static
        [MIPS] Make __declare_dbe_table static and avoid it getting optimized away
        [MIPS] Use MIPS R2 instructions for bitops.
        [MIPS] signals: Share even more code.
        [MIPS] Fix CONFIG_MIPS32_N32=y CONFIG_MIPS32_O32=n build
        [MIPS] Iomap implementation.
        [MIPS] <asm/compat-signal.h> needs to include <asm/uaccess.h>.
        [MIPS] IP27: Fix warning.
        [MIPS] Fix sigset_t endianess swapping issues in 32-bit compat code.
      cb553c48
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 · 42eaf0d8
      Linus Torvalds authored
      * 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
        hwmon/vt1211: Add probing of alternate config index port
        hwmon/f71805f: Fix a race condition
        hwmon/abituguru: Fix unchecked return status
        hwmon: New driver for the Analog Devices ADM1029
        hwmon/w83627ehf: Add support for the W83627DHG chip
        hwmon: Use subsys_initcall
        hwmon/lm70: Make lm70_remove a __devexit function
        hwmon: Cleanup a bogus legacy comment
        hwmon: Simplify the locking model of two drivers
        hwmon: Drop unused mutexes in two drivers
        hwmon/it87: Add PWM base frequency control
      42eaf0d8
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/mtd-2.6 · 49353617
      Linus Torvalds authored
      * git://git.infradead.org/mtd-2.6: (49 commits)
        [MTD] [NAND] S3C2412 fix hw ecc
        [MTD] [NAND] Work around false compiler warning in CAFÉ driver
        [JFFS2] printk warning fixes
        [MTD] [MAPS] ichxrom warning fix
        [MTD] [MAPS] amd76xrom warning fix
        [MTD] [MAPS] esb2rom warning fixes
        [MTD] [MAPS] ck804xrom warning fix
        [MTD] [MAPS] netsc520 warning fix
        [MTD] [MAPS] sc520cdp warning fix
        [MTD] [ONENAND] onenand_base warning fix
        [MTD] [NAND] eXcite nand flash driver
        [MTD] Improve heuristic for detecting wrong-endian RedBoot partition table
        [MTD] Fix RedBoot partition parsing regression harder.
        [MTD] [NAND] S3C2410: Hardware ECC correction code
        [JFFS2] Use MTD_OOB_AUTO to automatically place cleanmarker on NAND
        [MTD] Clarify OOB-operation interface comments
        [MTD] remove unused ecctype,eccsize fields from struct mtd_info
        [MTD] [NOR] Intel: remove ugly PROGREGION macros
        [MTD] [NOR] STAA: use writesize instead off eccsize to represent ECC block
        [MTD] OneNAND: Invalidate bufferRAM after erase
        ...
      49353617
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · 2874b391
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
        9p: implement optional loose read cache
        9p: Use kthread_stop instead of sending a SIGKILL.
      2874b391
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 5fc77247
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6:
        [SCSI] SCSI core: better initialization for sdev->scsi_level
        [SCSI] scsi_proc.c: display sdev->scsi_level correctly
        [SCSI] megaraid_sas: update version and author info
        [SCSI] megaraid_sas: return sync cache call with success
        [SCSI] megaraid_sas: replace pci_alloc_consitent with dma_alloc_coherent in ioctl path
        [SCSI] megaraid_sas: add bios_param in scsi_host_template
        [SCSI] megaraid_sas: do not process cmds if hw_crit_error is set
        [SCSI] scsi_transport.h should include scsi_device.h
        [SCSI] aic79xx: remove extra newline from info message
        [SCSI] scsi_scan.c: handle bad inquiry responses
        [SCSI] aic94xx: tie driver to the major number of the sequencer firmware
        [SCSI] lpfc: add PCI error recovery support
        [SCSI] megaraid: pci_module_init to pci_register_driver
        [SCSI] tgt: fix the user/kernel ring buffer interface
        [SCSI] sgiwd93: interfacing to wd33c93
        [SCSI] wd33c93: Fast SCSI with WD33C93B
      5fc77247
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input · d43a338e
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input:
        Input: remove obsolete setup parameters from input drivers
        Input: HIL - fix improper call to release_region()
        Input: hid-lgff - treat devices as joysticks unless told otherwise
        Input: HID - add support for Logitech Formula Force EX
        Input: gpio-keys - switch to common GPIO API
        Input: do not lock device when showing name, phys and uniq
        Input: i8042 - let serio bus suspend ports
        Input: psmouse - properly reset mouse on shutdown/suspend
      d43a338e
    • Linus Torvalds's avatar
      Merge branch 'audit.b37' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current · cb4aaf46
      Linus Torvalds authored
      * 'audit.b37' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
        [PATCH] AUDIT_FD_PAIR
        [PATCH] audit config lockdown
        [PATCH] minor update to rule add/delete messages (ver 2)
      cb4aaf46
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial · 874ff01b
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits)
        Documentation/kernel-docs.txt update.
        arch/cris: typo in KERN_INFO
        Storage class should be before const qualifier
        kernel/printk.c: comment fix
        update I/O sched Kconfig help texts - CFQ is now default, not AS.
        Remove duplicate listing of Cris arch from README
        kbuild: more doc. cleanups
        doc: make doc. for maxcpus= more visible
        drivers/net/eexpress.c: remove duplicate comment
        add a help text for BLK_DEV_GENERIC
        correct a dead URL in the IP_MULTICAST help text
        fix the BAYCOM_SER_HDX help text
        fix SCSI_SCAN_ASYNC help text
        trivial documentation patch for platform.txt
        Fix typos concerning hierarchy
        Fix comment typo "spin_lock_irqrestore".
        Fix misspellings of "agressive".
        drivers/scsi/a100u2w.c: trivial typo patch
        Correct trivial typo in log2.h.
        Remove useless FIND_FIRST_BIT() macro from cardbus.c.
        ...
      874ff01b
    • Linus Torvalds's avatar
      Merge branch 'kill-jffs' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6 · ebbe46f7
      Linus Torvalds authored
      * 'kill-jffs' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
        Remove JFFS (version 1), as scheduled.
      ebbe46f7
    • Linus Torvalds's avatar
      Merge branch 'acpi' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · 901ea4a0
      Linus Torvalds authored
      * 'acpi' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        [PATCH] libata: wrong sizeof for BUFFER
        [PATCH] libata: change order of _SDD/_GTF execution (resend #3)
        [PATCH] libata: ACPI _SDD support
        [PATCH] libata: ACPI and _GTF support
      901ea4a0
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 2370965c
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (51 commits)
        sk98lin: mark deprecated in Kconfig
        Hostess SV-11 depends on INET
        Fix link autonegotiation timer.
        sk98lin: planned removal
        B44: increase wait loop
        b44: replace define
        e1000: allow ethtool to see link status when down
        e1000: remove obsolete custom pci_save_state code
        e1000: fix shared interrupt warning message
        atm: Use ARRAY_SIZE macro when appropriate
        bugfixes and new hardware support for arcnet driver
        pcnet32 NAPI no longer experimental
        MAINTAINER
        macb: Remove inappropriate spinlocks around mii calls
        Convert meth to netdev_priv
        sky2: v1.13
        sky2: receive error handling improvements
        sky2: transmit timeout
        sky2: flow control negotiation for Yukon-FE
        sky2: no need to reset pause bits on shutdown
        ...
      2370965c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · 59b8175c
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (117 commits)
        [ARM] 4058/2: iop32x: set ->broken_parity_status on n2100 onboard r8169 ports
        [ARM] 4140/1: AACI stability add ac97 timeout and retries
        [ARM] 4139/1: AACI record support
        [ARM] 4138/1: AACI: multiple channel support for IRQ handling
        [ARM] 4211/1: Provide a defconfig for ns9xxx
        [ARM] 4210/1: base for new machine type "NetSilicon NS9360"
        [ARM] 4222/1: S3C2443: Remove reference to missing S3C2443_PM
        [ARM] 4221/1: S3C2443: DMA support
        [ARM] 4220/1: S3C24XX: DMA system initialised from sysdev
        [ARM] 4219/1: S3C2443: DMA source definitions
        [ARM] 4218/1: S3C2412: fix CONFIG_CPU_S3C2412_ONLY wrt to S3C2443
        [ARM] 4217/1: S3C24XX: remove the dma channel show at startup
        [ARM] 4090/2: avoid clash between PXA and SA1111 defines
        [ARM] 4216/1: add .gitignore entries for ARM specific files
        [ARM] 4214/2: S3C2410: Add Armzone QT2410
        [ARM] 4215/1: s3c2410 usb device:  per-platform vbus_draw
        [ARM] 4213/1: S3C2410 - Update definition of ADCTSC_XY_PST
        [ARM] 4098/1: ARM: rtc_lock only used with rtc_cmos
        [ARM] 4137/1: Add kexec support
        [ARM] 4201/1: SMP barriers pair needed for the secondary boot process
        ...
      
      Fix up conflict due to typedef removal in sound/arm/aaci.h
      59b8175c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · 920841d8
      Linus Torvalds authored
      * 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
        ieee1394: fix another deadlock in nodemgr
        ieee1394: cycle timer read extension for raw1394
      920841d8
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 5c56f466
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (34 commits)
        [POWERPC] 86xx: Cleaned up platform dts files
        [POWERPC] 85xx: Renamed MPC8568 MDS board code to match other boards
        [POWERPC] 85xx: Cleaning up machine probing
        [POWERPC] QE: clean up ucc_slow.c and ucc_fast.c
        [POWERPC] 85xx: Cleaned up platform dts files
        [POWERPC] 83xx: Renamed MPC8323 MDS dts and defconfig to match other boards
        [POWERPC] 83xx: Updated and renamed MPC8360PB to MPC836x MDS
        [POWERPC] 83xx: Use of_platform_bus_probe to setup QE devices
        [POWERPC] 83xx: use default value of loops_per_jiffy
        [POWERPC] 83xx: Remove obsolete setting of ROOT_DEV.
        [POWERPC] 83xx: Cleaning up machine probing and board initcalls
        [POWERPC] Dispose irq mapping when done in mpc52xx_serial.c
        [POWERPC] 86xx: Add missing of_node_put() in mpc86xx_hpcn_init_irq().
        [POWERPC] 8[56]xx: Remove obsolete setting of ROOT_DEV for 85xx and 86xx platforms.
        [POWERPC] pseries: Enabling auto poweron after power is restored.
        [POWERPC] use winbond libata instead of ide driver for pseries CD drives
        [POWERPC] powerpc: remove references to the obsolete linux,platform property
        [POWERPC] add of_get_mac_address and update fsl_soc.c to use it
        [POWERPC] 83xx: Cleaned up 83xx platform dts files
        [POWERPC] Fix bug with early ioremap and 64k pages
        ...
      5c56f466
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 · dd397a6d
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: (30 commits)
        ide: make ide_hwif_t.ide_dma_host_on void (v2)
        ide: make ide_hwif_t.ide_dma_{host_off,off_quietly} void (v2)
        ide: add ide_set_dma() helper (v2)
        sgiioc4: fix sgiioc4_ide_dma_check() to enable/disable DMA properly
        ide: disable DMA in ->ide_dma_check for "no IORDY" case (v2)
        ide: convert ide_hwif_t.mmio into flag (v2)
        ide: use PIO/MMIO operations directly where possible (v2)
        ide: add ide_use_fast_pio() helper (v3)
        ide: unexport ide_set_xfer_rate() (v2)
        ide: remove ide_drive_t.usage
        ide: remove ide_pci_device_t tables with only one entry
        ide: remove write-only ide_hwif_t.no_dsc flag
        ide: remove write-only ide_pio_data_t.blacklisted
        sis5513: sis5513_config_xfer_rate() cleanup
        piix: cleanup
        svwks: small cleanup
        cs5530: small cleanup
        hpt366: remove redundant check from init_dma_hpt366()
        trm290: remove redundant CONFIG_BLK_DEV_IDEDMA #ifdef-s
        au1xxx-ide: remove dead code
        ...
      dd397a6d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband · 976fd0e2
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
        IB/core: Set static rate in ib_init_ah_from_path()
        IB/ipath: Make ipath_map_sg() static
        IB/core: Fix sparse warnings about shadowed declarations
        RDMA/cma: Add multicast communication support
        IB/sa: Track multicast join/leave requests
        IPoIB: CM error handling thinko fix
        RDMA/cxgb3: Remove Open Grid Computing copyrights in iw_cxgb3 driver
        RDMA/cxgb3: Fail posts synchronously when in TERMINATE state
        RDMA/iwcm: iw_cm_id destruction race fixes
        IB/ehca: Change query_port() to return LINK_UP instead UNKNOWN
        IB/ehca: Allow en/disabling scaling code via module parameter
        IB/ehca: Fix race condition/locking issues in scaling code
        IB/ehca: Rework irq handler
        IPoIB: Only allow root to change between datagram and connected mode
        IB/mthca: Fix allocation of ICM chunks in coherent memory
        IB/mthca: Allow the QP state transition RESET->RESET
      976fd0e2
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 · 733abe4f
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
        PCI: Make PCI device numa-node attribute visible in sysfs
        PCI: add systems for automatic breadth-first device sorting
        PCI: PCI devices get assigned redundant IRQs
        PCI: Make CARDBUS_MEM_SIZE and CARDBUS_IO_SIZE boot options
        PCI: pci.txt fix __devexit() usage
        PCI/sysfs/kobject kernel-doc fixes
      733abe4f
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 · 5fe8252f
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
        sysfs: fix build errors: uevent with CONFIG_SYSFS=n
        pcmcia: some class_device fallout
        Driver core: device_add_attrs() cleanup
        debugfs: Remove misleading comments.
        debugfs: implement symbolic links
        Driver: remove redundant kobject_unregister checks
        kobject: kobj->k_name verification fix
        serial: Add PCMCIA IDs for Quatech DSP-100 dual RS232 adapter.
        Driver core: let request_module() send a /sys/modules/kmod/-uevent
        Driver.h copyright update
      5fe8252f
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 460223d2
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (39 commits)
        USB: at91-ohci, handle extra at91sam9261 ahb clock
        USB: another id for cp2101 driver
        USB: ueagle-atm.c needs sched.h
        USB: at91_udc, shrink runtime footprint
        usbnet: add missing Kconfig for KC2190 cables
        usbnet: init fault (oops) cleanup, whitespace fixes
        usbnet: recognize SiteCom CN-124
        usb: Remove Airprime device from option.c
        USB: change __init to __devinit for isp116x_probe
        USB: ps3: don't call ps3_system_bus_driver_register on other platforms
        USB: hid-core.c: Removes GTCO CalComp Interwrite IPanel PIDs from blacklist
        USB: kernel-doc fixes
        USB: quirky device for cdc-acm
        USB: cdc-acm: fix incorrect throtteling, make set_control optional
        USB: unconfigure devices which have config 0
        USB: make usb_iso_packet_descriptor.status signed
        USB: fix g_serial small error
        USB: use __u32 rather than u32 in userspace ioctls in usbdevice_fs.h
        USB Storage: US_FL_IGNORE_RESIDUE needed for Aiptek MP3 Player
        USB: Fix misspelled "USBNET_MII" kernel config option.
        ...
      460223d2
  2. 18 Feb, 2007 20 commits