1. 21 7月, 2007 30 次提交
  2. 20 7月, 2007 10 次提交
    • D
      AFS: Use patched rxrpc_kernel_send_data() correctly · bd6dc742
      David Howells 提交于
      Fix afs_send_simple_reply() to accept a greater-than-zero return value from
      rxrpc_kernel_send_data() as being a successful return rather than thinking it
      an error and aborting the call.
      
      rxrpc_kernel_send_data() previously returned zero incorrectly when it worked
      successfully, but has been patched to return the number of bytes it
      transmitted.
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      bd6dc742
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 · 5f7e08ca
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: (26 commits)
        sh: intc - add support for SH7750 and its variants
        sh: Move entry point code to .text.head.
        sh: heartbeat: Shut up resource size warning.
        sh: update r2d defconfig and fix SH7751R pci compliation
        sh: Many symbol exports for nommu allmodconfig.
        sh: zero terminate 8250 platform data for r2d board
        sh: cpufreq: Fix up the build for SH-2.
        sh: Make on-chip DMA channel selection explicit.
        sh: Fix up CPU dependencies for on-chip DMAC.
        sh: cpufreq: clock framework support.
        sh: Support rate rounding for SH7722 FRQCR clocks.
        sh: Implement clk_round_rate() in the clock framework.
        sh: Fix up PCI section mismatch warnings.
        sh: Wire up fallocate() syscall.
        sh: intc - add support for 7780
        sh: intc - improve group support
        sh: Fix up SH-3 and SH-4 driver dependencies.
        sh: push-switch: Correct license string.
        sh: cpufreq: Fix driver dependencies and flag as broken.
        sh: IPR/INTC2 IRQ setup consolidation.
        ...
      5f7e08ca
    • L
      Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa · 7f46e6ca
      Linus Torvalds 提交于
      * 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (102 commits)
        [ALSA] version 1.0.14
        [ALSA] remove duplicate Logitech Quickcam USB ID in usbquirks.h
        [ALSA] hda-codec - Fix input with STAC92xx
        [ALSA] hda-intel: support for iMac 24'' released on 09/2006
        [ALSA] hda-codec - Add quirk for Asus P5LD2
        [ALSA] snd-ca0106: Add support for X-Fi Extreme Audio.
        [ALSA] snd-emu10k1:Enable E-Mu 1616m notebook firmware loading.
        [ALSA] snd-emu10k1: Initial support for E-Mu 1616 and 1616m.
        [ALSA] cs46xx - Fix PM resume
        [ALSA] hda: Enable SPDIF in/out on some stac9205 boards
        [ALSA] timer: check for incorrect device state in non-debug compiles, too
        [ALSA] snd-aoa-codec-onyx: fix typo
        [ALSA] hda-codec - Add quirks for HP dx2200/dx2250
        [ALSA] hda-codec - Rename HP model-specific quirks
        [ALSA] hda-codec - Add quirk for HP Samba
        [ALSA] hda-codec - Add LG LW20 line-in capture source
        [ALSA] usb-audio - Fix AC3 with M-Audio Audiophile USB
        [ALSA] hda: stac9202 mixer fix
        [ALSA] Make s3c24xx_i2s_set_clkdiv() change the correct bits
        [ALSA] hda-codec - Add LG LW20 si3054 modem id
        ...
      7f46e6ca
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6 · c8e16aa2
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
        sh64: Flag sh64_get_page() as __init_refok.
        sh64: Move entry point code to .text.head.
        sh64: Fix up PCI section mismatch warnings.
        sh64: Update cayman defconfig.
        sh64: Wire up fallocate() syscall.
      c8e16aa2
    • L
      Merge branch 'cfq' of git://git.kernel.dk/data/git/linux-2.6-block · 6936b17e
      Linus Torvalds 提交于
      * 'cfq' of git://git.kernel.dk/data/git/linux-2.6-block:
        cfq: Write-only stuff in CFQ data structures
        cfq: async queue allocation per priority
      6936b17e
    • N
      arm: fix up handle_mm_fault changes · 5c72fc5c
      Nick Piggin 提交于
      Update arm to use bitwise types for its VM_FAULT_ constants.
      Signed-off-by: NNick Piggin <npiggin@suse.de>
      Cc: Russell King <rmk@arm.linux.org.uk>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      5c72fc5c
    • L
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · dee23837
      Linus Torvalds 提交于
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: (29 commits)
        libata: implement EH fast drain
        libata: schedule probing after SError access failure during autopsy
        libata: clear HOTPLUG flag after a reset
        libata: reorganize ata_ehi_hotplugged()
        libata: improve SCSI scan failure handling
        libata: quickly trigger SATA SPD down after debouncing failed
        libata: improve SATA PHY speed down logic
        The SATA controller device ID is different according to
        ahci: implement SCR_NOTIFICATION r/w
        ahci: make NO_NCQ handling more consistent
        libata: make ->scr_read/write callbacks return error code
        libata: implement AC_ERR_NCQ
        libata: improve EH report formatting
        sata_sil24: separate out sil24_do_softreset()
        sata_sil24: separate out sil24_exec_polled_cmd()
        sata_sil24: replace sil24_update_tf() with sil24_read_tf()
        ahci: separate out ahci_do_softreset()
        ahci: separate out ahci_exec_polled_cmd()
        ahci: separate out ahci_kick_engine()
        ahci: use deadline instead of fixed timeout for 1st FIS for SRST
        ...
      dee23837
    • M
      Fix Lindent to not indent preprocessor comments so far · e609ccc3
      Matthew Wilcox 提交于
      I recently ran Lindent over the AdvanSys driver and it moved the
      comments on #else and #endif lines way over to the right:
      
      	#else                          /* ADVANSYS_DEBUG */
      
      This doesn't match what I expect from kernel style, but it is
      documented.  We just need another flag to indent to make this look like:
      
      	#else /* ADVANSYS_DEBUG */
      Signed-off-by: NMatthew Wilcox <matthew@wil.cx>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e609ccc3
    • J
      Memory leak in tpm_ascii_bios_measurements_open() · 178554ae
      Jesper Juhl 提交于
      Coverity found a memory leak in tpm_ascii_bios_measurements_open().
      
      If "read_log(log)" fails, then we may leak 'log' and
      'log->bios_event_log'.
      Signed-off-by: NJesper Juhl <jesper.juhl@gmail.com>
      Cc: Seiji Munetoh <munetoh@jp.ibm.com>
      Cc: Stefan Berger <stefanb@us.ibm.com>
      Cc: Reiner Sailer <sailer@watson.ibm.com>
      Cc: Kylene Hall <kjhall@us.ibm.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      178554ae
    • G
      m68knommu: reformat show_cpuinfo() · 22982a56
      Greg Ungerer 提交于
      Reformat show_cpuinfo() to be consistent with normal coding style
      (and rest of this file).
      Signed-off-by: NGreg Ungerer <gerg@uclinux.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      22982a56