This project is mirrored from Pull mirroring updated .
  1. 29 Jan, 2008 31 commits
  2. 28 Jan, 2008 9 commits
    • Linus Torvalds's avatar
      Merge git:// · 8561b089
      Linus Torvalds authored
      * git://
        [WATCHDOG] constify function pointer tables
        [WATCHDOG] TXx9 watchdog driver
        [WATCHDOG] misc_register patch	
        [WATCHDOG] wdt: fix locking
    • Linus Torvalds's avatar
      Merge git:// · e189f349
      Linus Torvalds authored
      * git:// (197 commits)
        sh: add spi header and r2d platform data V3
        sh: update r7780rp interrupt code
        sh: remove consistent alloc stuff from the machine vector
        sh: use declared coherent memory for dreamcast pci ethernet adapter
        sh: declared coherent memory support V2
        sh: Add support for SDK7780 board.
        sh: constify function pointer tables
        sh: Kill off -traditional for linker script.
        cdrom: Add support for Sega Dreamcast GD-ROM.
        sh: Kill off hs7751rvoip reference from arch/sh/Kconfig.
        sh: Drop r7780rp_defconfig, use r7780mp_defconfig as kbuild default.
        sh: Kill off dead HS771RVoIP board support.
        sh: r7785rp: Fix up DECLARE_INTC_DESC() arg mismatch.
        sh: r7785rp: Hook up the rest of the HL7785 FPGA IRQ vectors.
        sh: r2d - enable sm501 usb host function
        sh: remove voyagergx
        sh: r2d - add lcd planel timings to sm501 platform data
        sh: Add OHCI and UDC platform devices for SH7720.
        sh: intc - remove default interrupt priority tables
        sh: Correct pte size mismatch for X2 TLB.
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git:// · f4798748
      Linus Torvalds authored
      * 'for-linus' of git:// (24 commits)
        HID: ADS/Tech Radio si470x needs blacklist entry
        HID: Logitech Extreme 3D needs NOGET quirk
        HID: Refactor MS Presenter 8K key mapping
        HID: MS Presenter mapping for PID 0x0701
        HID: Support Samsung IR remote
        HID: fix compilation of hidbp drivers without usbhid
        HID: Blacklist the Gretag-Macbeth Huey display colorimeter
        HID: the `bit' in hidinput_mapping_quirks() is an out parameter
        HID: remove redundant WARN_ON()s in order not to scare users
        HID: force hiddev creation for SONY PS3 controller
        HID: Use hid blacklist in usbmouse/usbkbd
        HID: proper handling of MS 4k and 6k devices
        HID: remove unused variable in quirk event handler
        HID: hid-input quirk for BTC 8193
        HID: separate hid-input event quirks from generic code
        HID: refactor mapping to input subsystem for quirky devices
        HID: Microsoft Wireless Optical Desktop 3.0 quirk
        HID: Add support for Logitech Elite keyboards
        HID: add full support for Genius KB-29E
        HID: fix a potential bug in pointer casting
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.25' of git:// · 8d01eddf
      Linus Torvalds authored
      * 'for-2.6.25' of git://
        block: implement drain buffers
        __bio_clone: don't calculate hw/phys segment counts
        block: allow queue dma_alignment of zero
        blktrace: Add blktrace ioctls to SCSI generic devices
    • Linus Torvalds's avatar
      Merge branch 'blk-end-request' of git:// · f0f00520
      Linus Torvalds authored
      * 'blk-end-request' of git:// (30 commits)
        blk_end_request: changing xsysace (take 4)
        blk_end_request: changing ub (take 4)
        blk_end_request: cleanup of request completion (take 4)
        blk_end_request: cleanup 'uptodate' related code (take 4)
        blk_end_request: remove/unexport end_that_request_* (take 4)
        blk_end_request: changing scsi (take 4)
        blk_end_request: add bidi completion interface (take 4)
        blk_end_request: changing ide-cd (take 4)
        blk_end_request: add callback feature (take 4)
        blk_end_request: changing ide normal caller (take 4)
        blk_end_request: changing cpqarray (take 4)
        blk_end_request: changing cciss (take 4)
        blk_end_request: changing ide-scsi (take 4)
        blk_end_request: changing s390 (take 4)
        blk_end_request: changing mmc (take 4)
        blk_end_request: changing i2o_block (take 4)
        blk_end_request: changing viocd (take 4)
        blk_end_request: changing xen-blkfront (take 4)
        blk_end_request: changing viodasd (take 4)
        blk_end_request: changing sx8 (take 4)
    • Linus Torvalds's avatar
      Merge branch 'sg' of git:// · 68fbda7d
      Linus Torvalds authored
      * 'sg' of git://
        SG: work with the SCSI fixed maximum allocations.
        SG: Convert SCSI to use scatterlist helpers for sg chaining
        SG: Move functions to lib/scatterlist.c and add sg chaining allocator helpers
    • Linus Torvalds's avatar
      Merge branch 'cfq-ioc-share' of git:// · d4928196
      Linus Torvalds authored
      * 'cfq-ioc-share' of git://
        cfq-iosched: kill some big inlines
        cfq-iosched: relax IOPRIO_CLASS_IDLE restrictions
        kernel: add CLONE_IO to specifically request sharing of IO contexts
        io_context sharing - anticipatory changes
        block: cfq: make the io contect sharing lockless
        io_context sharing - cfq changes
        io context sharing: preliminary support
        ioprio: move io priority from task_struct to io_context
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of · bb04af0e
      Linus Torvalds authored
      * 'for-linus' of (176 commits)
        [ARM] 4795/1: S3C244X: Add armclk and setparent call
        [ARM] 4794/1: S3C24XX: Comonise S3C2440 and S3C2442 clock code
        [ARM] 4793/1: S3C24XX: Add IRQ->GPIO pin mapping function
        [ARM] 4792/1: S3C24XX: Remove warnings from debug-macro.S
        [ARM] 4791/1: S3C2412: Make fclk a parent of msysclk
        [ARM] 4790/1: S3C2412: Fix parent selection for msysclk.
        [ARM] 4789/1: S3C2412: Add missing CLKDIVN register values
        [ARM] 4788/1: S3C24XX: Fix paramet to s3c2410_dma_ctrl if S3C2410_DMAF_AUTOSTART used.
        [ARM] 4787/1: S3C24XX: s3c2410_dma_request() should return the allocated channel number
        [ARM] 4786/1: S3C2412: Add SPI FIFO controll constants
        [ARM] 4785/1: S3C24XX: Add _SHIFT definitions for S3C2410_BANKCON registers
        [ARM] 4784/1: S3C24XX: Fix GPIO restore glitches
        [ARM] 4783/1: S3C24XX: Add s3c2410_gpio_getpull()
        [ARM] 4782/1: S3C24XX: Define FIQ_START for any FIQ users
        [ARM] 4781/1: S3C24XX: DMA suspend and resume support
        [ARM] 4780/1: S3C2412: Allow for seperate DMA channels for TX and RX
        [ARM] 4779/1: S3C2412: Add s3c2412_gpio_set_sleepcfg() call
        [ARM] 4778/1: S3C2412: Add armclk and init from DVS state
        [ARM] 4777/1: S3C24XX: Ensure clk_set_rate() checks the set_rate method for the clk
        [ARM] 4775/1: s3c2410: fix compilation error if only s3c2442 cpu is selected
    • Linus Nilsson's avatar
      libata: Change "write_data" to "rw" for some function documentations · 0affa456
      Linus Nilsson authored
      The documentation for ata_data_xfer and ata_data_xfer_noirq had the 'rw'
      parameter named 'write_data'.
      Signed-off-by: default avatarLinus Nilsson <>
      Signed-off-by: default avatarLinus Torvalds <>