1. 31 3月, 2012 32 次提交
    • L
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f558c272
      Linus Torvalds 提交于
      Pull genirq updates from Thomas Gleixner.
      
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        genirq: Adjust irq thread affinity on IRQ_SET_MASK_OK_NOCOPY return value
        genirq: Respect NUMA node affinity in setup_irq_irq affinity()
        genirq: Get rid of unneeded force parameter in irq_finalize_oneshot()
        genirq: Minor readablity improvement in irq_wake_thread()
      f558c272
    • L
      Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3a0d1849
      Linus Torvalds 提交于
      Pull core locking updates from Thomas Gleixner.
      
      * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        futex: Mark get_robust_list as deprecated
        futex: Do not leak robust list to unprivileged process
      3a0d1849
    • L
      Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6 · 623ff773
      Linus Torvalds 提交于
      Pull MTD changes from David Woodhouse:
       - Artem's cleanup of the MTD API continues apace.
       - Fixes and improvements for ST FSMC and SuperH FLCTL NAND, amongst
         others.
       - More work on DiskOnChip G3, new driver for DiskOnChip G4.
       - Clean up debug/warning printks in JFFS2 to use pr_<level>.
      
      Fix up various trivial conflicts, largely due to changes in calling
      conventions for things like dmaengine_prep_slave_sg() (new inline
      wrapper to hide new parameter, clashing with rewrite of previously last
      parameter that used to be an 'append' flag, and is now a bitmap of
      'unsigned long flags').
      
      (Also some header file fallout - like so many merges this merge window -
      and silly conflicts with sparse fixes)
      
      * tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6: (120 commits)
        mtd: docg3 add protection against concurrency
        mtd: docg3 refactor cascade floors structure
        mtd: docg3 increase write/erase timeout
        mtd: docg3 fix inbound calculations
        mtd: nand: gpmi: fix function annotations
        mtd: phram: fix section mismatch for phram_setup
        mtd: unify initialization of erase_info->fail_addr
        mtd: support ONFI multi lun NAND
        mtd: sm_ftl: fix typo in major number.
        mtd: add device-tree support to spear_smi
        mtd: spear_smi: Remove default partition information from driver
        mtd: Add device-tree support to fsmc_nand
        mtd: fix section mismatch for doc_probe_device
        mtd: nand/fsmc: Remove sparse warnings and errors
        mtd: nand/fsmc: Add DMA support
        mtd: nand/fsmc: Access the NAND device word by word whenever possible
        mtd: nand/fsmc: Use dev_err to report error scenario
        mtd: nand/fsmc: Use devm routines
        mtd: nand/fsmc: Modify fsmc driver to accept nand timing parameters via platform
        mtd: fsmc_nand: add pm callbacks to support hibernation
        ...
      623ff773
    • L
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · c39e8ede
      Linus Torvalds 提交于
      Pull a few more ARM platform fixes from Olof Johansson:
       "Apologies for back-to-back fixes pull requests, but one of the patches
        below are the kind we'll see posted over and over if we don't send it
        in.  I hadn't done the full sanity-check of defconfig builds by the
        time I sent up the other fixes yesterday or I would have included it
        then.
      
        Two patches, one dealing with the system.h fallout, the other is a
        missing linux/bug.h in a place where ARRAY_SIZE() is used."
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: clps711x: fix missing include file
        ARM: fix builds due to missing <asm/system_misc.h> includes
      c39e8ede
    • L
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux · a335750b
      Linus Torvalds 提交于
      Pull ACPI & Power Management changes from Len Brown:
       - ACPI 5.0 after-ripples, ACPICA/Linux divergence cleanup
       - cpuidle evolving, more ARM use
       - thermal sub-system evolving, ditto
       - assorted other PM bits
      
      Fix up conflicts in various cpuidle implementations due to ARM cpuidle
      cleanups (ARM at91 self-refresh and cpu idle code rewritten into
      "standby" in asm conflicting with the consolidation of cpuidle time
      keeping), trivial SH include file context conflict and RCU tracing fixes
      in generic code.
      
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (77 commits)
        ACPI throttling: fix endian bug in acpi_read_throttling_status()
        Disable MCP limit exceeded messages from Intel IPS driver
        ACPI video: Don't start video device until its associated input device has been allocated
        ACPI video: Harden video bus adding.
        ACPI: Add support for exposing BGRT data
        ACPI: export acpi_kobj
        ACPI: Fix logic for removing mappings in 'acpi_unmap'
        CPER failed to handle generic error records with multiple sections
        ACPI: Clean redundant codes in scan.c
        ACPI: Fix unprotected smp_processor_id() in acpi_processor_cst_has_changed()
        ACPI: consistently use should_use_kmap()
        PNPACPI: Fix device ref leaking in acpi_pnp_match
        ACPI: Fix use-after-free in acpi_map_lsapic
        ACPI: processor_driver: add missing kfree
        ACPI, APEI: Fix incorrect APEI register bit width check and usage
        Update documentation for parameter *notrigger* in einj.txt
        ACPI, APEI, EINJ, new parameter to control trigger action
        ACPI, APEI, EINJ, limit the range of einj_param
        ACPI, APEI, Fix ERST header length check
        cpuidle: power_usage should be declared signed integer
        ...
      a335750b
    • L
      Merge git://git.samba.org/sfrench/cifs-2.6 · 10f3cb41
      Linus Torvalds 提交于
      Pull cifs fixes from Steve French.
      
      * git://git.samba.org/sfrench/cifs-2.6:
        [CIFS] Update CIFS version number to 1.77
        CIFS: Add missed forcemand mount option
        [CIFS] Fix trivial sparse warning with asyn i/o patch
        cifs: handle "sloppy" option appropriately
        cifs: use standard token parser for mount options
        cifs: remove /proc/fs/cifs/OplockEnabled
        cifs: convert cifs_iovec_write to use async writes
        cifs: call cifs_update_eof with i_lock held
        cifs: abstract out function to marshal up the iovec array for async writes
        cifs: fix up get_numpages
        cifs: make cifsFileInfo_get return the cifsFileInfo pointer
        cifs: fix allocation in cifs_write_allocate_pages
        cifs: allow caller to specify completion op when allocating writedata
        cifs: add pid field to cifs_writedata
        cifs: add new cifsiod_wq workqueue
        CIFS: Change mid_q_entry structure fields
        CIFS: Expand CurrentMid field
        CIFS: Separate protocol-specific code from cifs_readv_receive code
        CIFS: Separate protocol-specific code from demultiplex code
        CIFS: Separate protocol-specific code from transport routines
      10f3cb41
    • L
      Merge tag 'for-v3.4-rc1' of git://git.infradead.org/battery-2.6 · 919c8401
      Linus Torvalds 提交于
      Pull battery updates from Anton Vorontsov:
       "Various small bugfixes and enhancements, plus two new drivers:
         - A quite complex ab8500 charger driver, submitted by Arun Murthy @
           ST-Ericsson;
         - Summit Microelectronics SMB347 Battery Charger, submitted by Bruce
           E Robertson and Alan Cox @ Intel.
      
        And that's all."
      
      * tag 'for-v3.4-rc1' of git://git.infradead.org/battery-2.6: (36 commits)
        max17042_battery: Clean up interrupt handling
        Revert "max8998_charger: Include linux/module.h just once"
        ab8500_fg: Fix some build warnings on x86_64
        max17042_battery: Fix CHARGE_FULL representation.
        max8998_charger: Include linux/module.h just once
        power_supply: Convert i2c drivers to module_i2c_driver
        lp8727_charger: Add MODULE_DEVICE_TABLE
        charger-manager: Simplify charger_get_property(), get rid of a warning
        charger-manager: Clean up for better readability
        da9052-battery: Convert to use module_platform_driver
        da9052-battery: Fix a memory leak when unload the module
        da9052-battery: Add missing platform_set_drvdata
        ab8500: Turn unneeded global symbols into local ones
        ab8500_fg: Fix copy-paste error
        ab8500_fg: Get rid of 'struct battery_type'
        ab8500_fg: Get rid of 'struct v_to_cap'
        ab8500_btemp: Get rid of 'enum adc_therm'
        ab8500_charger: Convert to the new USB OTG calls
        ab8500-btemp: AB8500 battery temperature driver
        ab8500-fg: A8500 fuel gauge driver
        ...
      919c8401
    • L
      Merge branch 'dunlap' (Randy's Documentation patches) · a9d38a4f
      Linus Torvalds 提交于
      Merge Documentation fixes from Randy Dunlap.
      
      Fixed up several small annoyances (bad changelogs and corrupted utf8
      names), I need to try to convince people to do things right.
      
      * emailed from Randy Dunlap <rdunlap@xenotime.net>:
        Documentation: fix typo in ABI/stable/sysfs-driver-usb-usbtmc
        Documentation: replace install commands with softdeps
        Documentation: remove references to /etc/modprobe.conf
        Documentation: input.txt: clarify mousedev 'cat' command syntax
        Documentation: CodingStyle: add inline assembly guidelines
        Documentation: sysrq: Crutcher Dunnavant is unavailable
        Documentation: mention scripts/diffconfig tool
        Documentation: remove 'mach' from dontdiff file
      a9d38a4f
    • R
      Documentation: fix typo in ABI/stable/sysfs-driver-usb-usbtmc · c4801382
      Rafal Kapela 提交于
      Fix "the the" in ABI/stable/sysfs-driver-usb-usbtmc
      Signed-off-by: NRafal Kapela <raf.kapela@gmail.com>
      Signed-off-by: NRandy Dunlap <rdunlap@xenotime.net>
      Cc: Greg KH <gregkh@linuxfoundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      c4801382
    • L
      Documentation: replace install commands with softdeps · 78286cdf
      Lucas De Marchi 提交于
      Install commands should not be used to specify soft dependencies among
      modules. When loading modules it's much better to have a softdep that
      modprobe knows what's being done than having to fork/exec another
      instance of modprobe to load the other module.
      
      By using a softdep user has also an option to remove the dependencies
      when removing the module (and if its refcount dropped to 0)
      Signed-off-by: NLucas De Marchi <lucas.demarchi@profusion.mobi>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      78286cdf
    • L
      Documentation: remove references to /etc/modprobe.conf · 970e2486
      Lucas De Marchi 提交于
      Usage of /etc/modprobe.conf file was deprecated by module-init-tools and
      is no longer parsed by new kmod tool. References to this file are
      replaced in Documentation, comments and Kconfig according to the
      context.
      
      There are also some references to the old /etc/modules.conf from 2.4
      kernels that are being removed.
      Signed-off-by: NLucas De Marchi <lucas.demarchi@profusion.mobi>
      Acked-by: NTakashi Iwai <tiwai@suse.de>
      Acked-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      Signed-off-by: NRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      970e2486
    • R
      Documentation: input.txt: clarify mousedev 'cat' command syntax · 09601523
      Randy Dunlap 提交于
      Clarify that the 'cat' command does not include the (c, 13, 32)
      after it.
      Reported-by: NDan Jidanni Jacobson <jidanni@jidanni.org>
      Signed-off-by: NRandy Dunlap <rdunlap@xenotime.net>
      Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      09601523
    • J
    • R
    • J
      Documentation: mention scripts/diffconfig tool · 673d29f9
      Javi Merino 提交于
      The kconfig documentation suggests using plain 'diff' to compare config
      files and then adds "Yes, we need something better here".  Commit
      a717417e ("kconfig: add diffconfig utility") added what that comment
      was looking for.
      Signed-off-by: NJavi Merino <javi.merino@arm.com>
      Cc: Michal Marek <mmarek@suse.cz>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      673d29f9
    • H
      Documentation: remove 'mach' from dontdiff file · f52a7593
      H Hartley Sweeten 提交于
      The mach entry in the dontdiff file causes all the
      arch/arm/mach-*/include/mach directories to be skipped.
      Signed-off-by: NH Hartley Sweeten <hsweeten@visionengravers.com>
      Signed-off-by: NRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f52a7593
    • O
      ARM: clps711x: fix missing include file · d3c7de52
      Olof Johansson 提交于
      linux/bug.h is needed due to an ARRAY_SIZE being used:
      
      arch/arm/mach-clps711x/edb7211-mm.c: In function 'edb7211_map_io':
      arch/arm/mach-clps711x/edb7211-mm.c:79:9: error: implicit declaration of function 'BUILD_BUG_ON_ZERO'
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      d3c7de52
    • O
      ARM: fix builds due to missing <asm/system_misc.h> includes · 86dfe446
      Olof Johansson 提交于
      This does a sweeping change fixing up all the missing system_misc.h and
      system_info.h includes from the system.h split-up change. These were the
      ones I came across when building all defconfigs in arch/arm/configs, there
      might be more but they lack adequate build coverage to be easily caught.
      
      I'm expecting to get a lot of these piecemeal by each maintainer, so we
      might just as well do one sweeping change to get them all at once.
      
      Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Sascha Hauer <kernel@pengutronix.de>
      Cc: Imre Kaloz <kaloz@openwrt.org>
      Cc: Krzysztof Halasa <khc@pm.waw.pl>
      Cc: Eric Miao <eric.y.miao@gmail.com>
      Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
      Cc: Wan ZongShun <mcuos.com@gmail.com>
      Acked-by: NKukjin Kim <kgene.kim@samsung.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      86dfe446
    • J
      genirq: Adjust irq thread affinity on IRQ_SET_MASK_OK_NOCOPY return value · f5cb92ac
      Jiang Liu 提交于
      irq_move_masked_irq() checks the return code of
      chip->irq_set_affinity() only for 0, but IRQ_SET_MASK_OK_NOCOPY is
      also a valid return code, which is there to avoid a redundant copy of
      the cpumask. But in case of IRQ_SET_MASK_OK_NOCOPY we not only avoid
      the redundant copy, we also fail to adjust the thread affinity of an
      eventually threaded interrupt handler.
      
      Handle IRQ_SET_MASK_OK (==0) and IRQ_SET_MASK_OK_NOCOPY(==1) return
      values correctly by checking the valid return values seperately.
      Signed-off-by: NJiang Liu <jiang.liu@huawei.com>
      Cc: Jiang Liu <liuj97@gmail.com>
      Cc: Keping Chen <chenkeping@huawei.com>
      Cc: stable@vger.kernel.org
      Link: http://lkml.kernel.org/r/1333120296-13563-2-git-send-email-jiang.liu@huawei.comSigned-off-by: NThomas Gleixner <tglx@linutronix.de>
      f5cb92ac
    • L
      Merge branch 'tboot' into release · d326f44e
      Len Brown 提交于
      Conflicts:
      	drivers/acpi/acpica/hwsleep.c
      
      Text conflict between:
      
      2feec47d
      (ACPICA: ACPI 5: Support for new FADT SleepStatus, SleepControl registers)
      
      which removed #include "actables.h"
      
      and
      
      09f98a82
      (x86, acpi, tboot: Have a ACPI os prepare sleep instead of calling tboot_sleep.)
      
      which removed #include <linux/tboot.h>
      
      The resolution is to remove them both.
      Signed-off-by: NLen Brown <len.brown@intel.com>
      d326f44e
    • L
      Merge branch 'd3' into release · ec612fcf
      Len Brown 提交于
      Conflicts:
      	drivers/acpi/sleep.c
      
      This was a text conflict between
      a2ef5c4f
      (ACPI: Move module parameter gts and bfs to sleep.c)
      
      which added #include <linux/module.h>
      
      and
      
      b24e5098
      (ACPI, PCI: Move acpi_dev_run_wake() to ACPI core)
      
      which added #include <linux/pm_runtime.h>
      
      The resolution was to take them both.
      Signed-off-by: NLen Brown <len.brown@intel.com>
      ec612fcf
    • L
      Merge branch 'apei' into release · 73f05330
      Len Brown 提交于
      Conflicts:
      	drivers/acpi/apei/apei-base.c
      
      This was a conflict between
      
      15afae60
      (CPI, APEI: Fix incorrect APEI register bit width check and usage)
      
      and
      
      653f4b53
      (ACPICA: Expand OSL memory read/write interfaces to 64 bits)
      
      The former changed a parameter in the call to acpi_os_read_memory64()
      and the later replaced all calls to acpi_os_read_memory64()
      with calls to acpi_os_read_memory().
      Signed-off-by: NLen Brown <len.brown@intel.com>
      73f05330
    • L
      Merge branches 'acpica', 'bgrt', 'bz-11533', 'cpuidle', 'ec', 'hotplug',... · 1a05e467
      Len Brown 提交于
      Merge branches 'acpica', 'bgrt', 'bz-11533', 'cpuidle', 'ec', 'hotplug', 'misc', 'red-hat-bz-727865', 'thermal', 'throttling', 'turbostat' and 'video' into release
      Signed-off-by: NLen Brown <len.brown@intel.com>
      1a05e467
    • D
      ACPI throttling: fix endian bug in acpi_read_throttling_status() · 344e222e
      Dan Carpenter 提交于
      Using a u64 here creates an endian bug.  We store a u32 number in the
      top byte which is a larger number than intended on big endian systems.
      There is no reason to use a 64 bit data type here, I guess it was just
      an oversight.
      
      I removed the initialization to zero as well.  It's needed with a u64
      but with a u32, the variable gets initialized properly inside the call
      to acpi_os_read_port().
      Signed-off-by: NDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: NLen Brown <len.brown@intel.com>
      344e222e
    • A
      Disable MCP limit exceeded messages from Intel IPS driver · c264c651
      Andi Kleen 提交于
      On a system on the thermal limit these are quite noisy and flood the logs.
      Better would be a counter anyways. But given that we don't even have
      anything for normal throttling this doesn't seem to be urgent either.
      Reviewed-by: NJesse Barnes <jbarnes@virtuousgeek.org>
      Signed-off-by: NAndi Kleen <ak@linux.intel.com>
      Signed-off-by: NLen Brown <len.brown@intel.com>
      c264c651
    • I
      ACPI video: Don't start video device until its associated input device has been allocated · b60e7f61
      Igor Murzov 提交于
      Quoth Dmitry Torokhov:
      In addition to bus notifier we do install device notifier explicitly
      so it might fire up early. The easiest fox would be to move
      acpi_video_bus_start_devices() after input_allocate_device() but
      before input_register_device() - unregistered input devices can handle
      input_event() calls just fine.
      
      May fix crashes reported in:
      https://bugzilla.kernel.org/show_bug.cgi?id=40672Signed-off-by: NIgor Murzov <e-mail@date.by>
      Signed-off-by: NLen Brown <len.brown@intel.com>
      b60e7f61
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 9613bebb
      Linus Torvalds 提交于
      Pull btrfs fixes and features from Chris Mason:
       "We've merged in the error handling patches from SuSE.  These are
        already shipping in the sles kernel, and they give btrfs the ability
        to abort transactions and go readonly on errors.  It involves a lot of
        churn as they clarify BUG_ONs, and remove the ones we now properly
        deal with.
      
        Josef reworked the way our metadata interacts with the page cache.
        page->private now points to the btrfs extent_buffer object, which
        makes everything faster.  He changed it so we write an whole extent
        buffer at a time instead of allowing individual pages to go down,,
        which will be important for the raid5/6 code (for the 3.5 merge
        window ;)
      
        Josef also made us more aggressive about dropping pages for metadata
        blocks that were freed due to COW.  Overall, our metadata caching is
        much faster now.
      
        We've integrated my patch for metadata bigger than the page size.
        This allows metadata blocks up to 64KB in size.  In practice 16K and
        32K seem to work best.  For workloads with lots of metadata, this cuts
        down the size of the extent allocation tree dramatically and fragments
        much less.
      
        Scrub was updated to support the larger block sizes, which ended up
        being a fairly large change (thanks Stefan Behrens).
      
        We also have an assortment of fixes and updates, especially to the
        balancing code (Ilya Dryomov), the back ref walker (Jan Schmidt) and
        the defragging code (Liu Bo)."
      
      Fixed up trivial conflicts in fs/btrfs/scrub.c that were just due to
      removal of the second argument to k[un]map_atomic() in commit
      7ac687d9.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (75 commits)
        Btrfs: update the checks for mixed block groups with big metadata blocks
        Btrfs: update to the right index of defragment
        Btrfs: do not bother to defrag an extent if it is a big real extent
        Btrfs: add a check to decide if we should defrag the range
        Btrfs: fix recursive defragment with autodefrag option
        Btrfs: fix the mismatch of page->mapping
        Btrfs: fix race between direct io and autodefrag
        Btrfs: fix deadlock during allocating chunks
        Btrfs: show useful info in space reservation tracepoint
        Btrfs: don't use crc items bigger than 4KB
        Btrfs: flush out and clean up any block device pages during mount
        btrfs: disallow unequal data/metadata blocksize for mixed block groups
        Btrfs: enhance superblock sanity checks
        Btrfs: change scrub to support big blocks
        Btrfs: minor cleanup in scrub
        Btrfs: introduce common define for max number of mirrors
        Btrfs: fix infinite loop in btrfs_shrink_device()
        Btrfs: fix memory leak in resolver code
        Btrfs: allow dup for data chunks in mixed mode
        Btrfs: validate target profiles only if we are going to use them
        ...
      9613bebb
    • I
      ACPI video: Harden video bus adding. · ea9f8856
      Igor Murzov 提交于
      It is always better to check return values, so add some new checks and
      correct existing ones.
      
      v2: Be consistent and don't mix errors from -E* and AE_* namespaces.
      Signed-off-by: NIgor Murzov <e-mail@date.by>
      Signed-off-by: NLen Brown <len.brown@intel.com>
      ea9f8856
    • D
      ia64: Fixup asm/cmpxchg.h · 40380f1c
      David Howells 提交于
      The empty asm/cmpxchg.h file that was provided as a temporary build fix
      for the asm/system.h disintgration build problem should really include
      <asm/intrinsics.h> to make definitions of xchg() and cmpxchg()
      available.
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NTony Luck <tony.luck@intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      40380f1c
    • L
      Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 48a46752
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "A collection of small fixes for 3.4-rc1, including
         - mic-recording regression fix for Realtek codec
         - clean-up of dmaengine parameter mess
         - WM8894 calibration tweak
         - minor fixes for asihpi and some bool module parms"
      
      * tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: fix isa/opti9xx module param type
        sound: fix oss/msnd_pinnacle module param type
        ALSA: asihpi - fix return type of hpios_locked_mem_alloc()
        ASoC: dmaengine_pcm: use dmaengine cyclic wrapper
        ASoC: Add extra parameter to device_prep_dma_cyclic
        ALSA: hda/realtek - Fix ADC assignment with a shared HP/Mic pin
        ASoC: wm8994: Update WM8994 DCS calibration
      48a46752
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 59f2fe32
      Linus Torvalds 提交于
      Pull s390 build fixes from Martin Schwidefsky.
      
      More small fixes for the system.h disintegration.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        [S390] Fix build errors (fallout from system.h disintegration)
      59f2fe32
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 307cc790
      Linus Torvalds 提交于
      Pull minor Sparc fixes from David Miller:
       "This just fixes build fallout due to recent changes that went int your
        tree."
      
      Sam Ravnborg says that sparc32 still needs some more tender loving.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc: Fix even more fallout from system.h split.
        sparc: fix fallout from system.h split
      307cc790
  2. 30 3月, 2012 8 次提交