26 Dec, 2009

1 commit

  • This patch fixes a build failure introduced by the patch
    ALSA: AACI: factor common hw_params logic into aaci_pcm_hw_params [1]
    by adding/moving the aaci struct to the right position.

    The patch mentioned above merged common source parts into one function,
    but unfortunately left out the aaci struct and consequently caused a
    build failure e.g. for arm versatile_config [2]

    References:
    [1] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=d3aee7996c30f928bbbbfd0994148e35d2e83084
    [2] http://kisskb.ellerman.id.au/kisskb/buildresult/1893605/

    Patch against Linus' tree.

    Signed-off-by: Peter Huewe
    Signed-off-by: Takashi Iwai

    Peter Huewe
     

25 Dec, 2009

11 commits

  • Signed-off-by: Guennadi Liakhovetski
    Signed-off-by: Takashi Iwai

    Guennadi Liakhovetski
     
  • Linus Torvalds
     
  • * 'sysctl' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-misc-2.6:
    SYSCTL: Add a mutex to the page_alloc zone order sysctl
    SYSCTL: Print binary sysctl warnings (nearly) only once

    Linus Torvalds
     
  • * 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6:
    HWPOISON: Add PROC_FS dependency to hwpoison injector v2

    Linus Torvalds
     
  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (34 commits)
    classmate-laptop: add support for Classmate PC ACPI devices
    hp-wmi: Fix two memleaks
    acer-wmi, msi-wmi: Remove needless DMI MODULE_ALIAS
    dell-wmi: do not keep driver loaded on unsupported boxes
    wmi: Free the allocated acpi objects through wmi_get_event_data
    drivers/platform/x86/acerhdf.c: check BIOS information whether it begins with string of table
    acerhdf: add new BIOS versions
    acerhdf: limit modalias matching to supported
    toshiba_acpi: convert to seq_file
    asus_acpi: convert to seq_file
    ACPI: do not select ACPI_DOCK from ATA_ACPI
    sony-laptop: enumerate rfkill devices using SN06
    sony-laptop: rfkill support for newer models
    ACPI: fix OSC regression that caused aer and pciehp not to load
    MAINTAINERS: add maintainer for msi-wmi driver
    fujitu-laptop: fix tests of acpi_evaluate_integer() return value
    arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c: avoid cross-CPU interrupts by using smp_call_function_any()
    ACPI: processor: remove _PDC object list from struct acpi_processor
    ACPI: processor: change acpi_processor_set_pdc() interface
    ACPI: processor: open code acpi_processor_cleanup_pdc
    ...

    Linus Torvalds
     
  • * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
    ocfs2/trivial: Use le16_to_cpu for a disk value in xattr.c
    ocfs2/trivial: Use proper mask for 2 places in hearbeat.c
    Ocfs2: Let ocfs2 support fiemap for symlink and fast symlink.
    Ocfs2: Should ocfs2 support fiemap for S_IFDIR inode?
    ocfs2: Use FIEMAP_EXTENT_SHARED
    fiemap: Add new extent flag FIEMAP_EXTENT_SHARED
    ocfs2: replace u8 by __u8 in ocfs2_fs.h
    ocfs2: explicit declare uninitialized var in user_cluster_connect()
    ocfs2-devel: remove redundant OCFS2_MOUNT_POSIX_ACL check in ocfs2_get_acl_nolock()
    ocfs2: return -EAGAIN instead of EAGAIN in dlm
    ocfs2/cluster: Make fence method configurable - v2
    ocfs2: Set MS_POSIXACL on remount
    ocfs2: Make acl use the default
    ocfs2: Always include ACL support

    Linus Torvalds
     
  • * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
    VIDEO: cyberpro: pci_request_regions needs a persistent name
    ARM: dma-isa: request cascade channel after registering it
    ARM: footbridge: trim down old ISA rtc setup
    ARM: fix PAGE_KERNEL
    ARM: Fix wrong shared bit for CPU write buffer bug test
    ARM: 5857/1: ARM: dmabounce: fix build
    ARM: 5856/1: Fix bug of uart0 platfrom data for nuc900
    ARM: 5855/1: putc support for nuc900
    ARM: 5854/1: fix compiling error for NUC900
    ARM: 5849/1: ARMv7: fix Oprofile events count
    ARM: add missing include to nwflash.c
    ARM: Kill CONFIG_CPU_32
    ARM: Convert VFP/Crunch/XscaleCP thread_release() to exit_thread()
    ARM: 5853/1: ARM: Fix build break on ARM v6 and v7

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
    edac, pci: remove pesky debug printk
    amd64_edac: restrict PCI config space access
    amd64_edac: fix forcing module load/unload
    amd64_edac: make driver loading more robust
    amd64_edac: fix driver instance freeing
    amd64_edac: fix K8 chip select reporting

    Linus Torvalds
     
  • * 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
    sh: Ensure all PG_dcache_dirty pages are written back.
    sh: mach-ecovec24: setup.c detailed correction
    serial: sh-sci: Convert tremaining ctrl_xxx I/O routines to __raw_xxx.
    serial: sh-sci: earlyprintk zero uartclk fix
    sh: Only use bl bit toggling for sleeping idle.
    sh: Restore bl bit toggling in idle loop.
    sh: Fix up MAX_DMA_CHANNELS definition when DMA is disabled.
    sh: dmaengine support for SH7785
    sh: dmaengine support for sh7724.

    Linus Torvalds
     
  • Don't pass a name pointer from the kernel stack, it will not survive
    and will result in corrupted /proc/iomem output.

    Signed-off-by: Russell King

    Russell King
     
  • We can't request the cascade channel before it's been registered, so
    move it afterwards.

    Signed-off-by: Russell King

    Russell King
     

24 Dec, 2009

28 commits