1. 02 3月, 2010 7 次提交
    • T
      Merge with mainline to remove plat-omap/Kconfig conflict · d702d121
      Tony Lindgren 提交于
      Conflicts:
      	arch/arm/plat-omap/Kconfig
      d702d121
    • L
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · ac0f6f92
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (100 commits)
        ARM: Eliminate decompressor -Dstatic= PIC hack
        ARM: 5958/1: ARM: U300: fix inverted clk round rate
        ARM: 5956/1: misplaced parentheses
        ARM: 5955/1: ep93xx: move timer defines into core.c and document
        ARM: 5954/1: ep93xx: move gpio interrupt support to gpio.c
        ARM: 5953/1: ep93xx: fix broken build of clock.c
        ARM: 5952/1: ARM: MM: Add ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kconfig
        ARM: 5949/1: NUC900 add gpio virtual memory map
        ARM: 5948/1: Enable timer0 to time4 clock support for nuc910
        ARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk
        ARM: make_coherent(): fix problems with highpte, part 2
        MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself
        ARM: 5945/1: ep93xx: include correct irq.h in core.c
        ARM: 5933/1: amba-pl011: support hardware flow control
        ARM: 5930/1: Add PKMAP area description to memory.txt.
        ARM: 5929/1: Add checks to detect overlap of memory regions.
        ARM: 5928/1: Change type of VMALLOC_END to unsigned long.
        ARM: 5927/1: Make delimiters of DMA area globally visibly.
        ARM: 5926/1: Add "Virtual kernel memory..." printout.
        ARM: 5920/1: OMAP4: Enable L2 Cache
        ...
      
      Fix up trivial conflict in arch/arm/mach-mx25/clock.c
      ac0f6f92
    • L
      Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block · b1bf9368
      Linus Torvalds 提交于
      * 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block: (38 commits)
        block: don't access jiffies when initialising io_context
        cfq: remove 8 bytes of padding from cfq_rb_root on 64 bit builds
        block: fix for "Consolidate phys_segment and hw_segment limits"
        cfq-iosched: quantum check tweak
        blktrace: perform cleanup after setup error
        blkdev: fix merge_bvec_fn return value checks
        cfq-iosched: requests "in flight" vs "in driver" clarification
        cciss: Fix problem with scatter gather elements in the scsi half of the driver
        cciss: eliminate unnecessary pointer use in cciss scsi code
        cciss: do not use void pointer for scsi hba data
        cciss: factor out scatter gather chain block mapping code
        cciss: fix scatter gather chain block dma direction kludge
        cciss: simplify scatter gather code
        cciss: factor out scatter gather chain block allocation and freeing
        cciss: detect bad alignment of scsi commands at build time
        cciss: clarify command list padding calculation
        cfq-iosched: rethink seeky detection for SSDs
        cfq-iosched: rework seeky detection
        block: remove padding from io_context on 64bit builds
        block: Consolidate phys_segment and hw_segment limits
        ...
      b1bf9368
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 524df557
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (252 commits)
        ASoC: Check progress when reporting periods from i.MX FIQ handler
        ASoC: Remove a unused variables from i.MX FIQ runtime data
        ALSA: hda - Add/fix ALC269 FSC and Quanta models
        ALSA: hda - Add ALC670 codec support
        OMAP4: PMIC: Add support for twl6030 codec
        ALSA: hda - remove unnecessary msleep on power state transitions
        usb/gadget/{f_audio,gmidi}.c: follow recent changes in audio.h
        ASoC: fsi: Modify over/under run error settlement
        ASoC: OMAP4: Add McPDM platform driver
        ASoC: OMAP4: Add support for McPDM
        ASoC: OMAP: data_type and sync_mode configurable in audio dma
        ALSA: hda - Add missing description in HD-Audio-Models.txt
        ALSA: add support for Macbook Air 2,1 internal speaker
        ALSA: usbaudio: consolidate header files
        ALSA: usbmixer: bail out early when parsing audio class v2 descriptors
        ALSA: usbaudio: implement basic set of class v2.0 parser
        ALSA: usbaudio: introduce new types for audio class v2
        ALSA: usbaudio: parse USB descriptors with structs
        ALSA: hda - enable snoop for Intel Cougar Point
        ALSA: hda - Remove identical definitions for macmini3 model
        ...
      524df557
    • L
      Merge branches 'futexes-for-linus', 'irq-core-for-linus' and... · 0f453397
      Linus Torvalds 提交于
      Merge branches 'futexes-for-linus', 'irq-core-for-linus' and 'bkl-drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        futex: Protect pid lookup in compat code with RCU
      
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        genirq: Fix documentation of default chip disable()
      
      * 'bkl-drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        nvram: Drop the BKL from nvram_open()
      0f453397
    • L
      Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · e56425b1
      Linus Torvalds 提交于
      * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        posix-timers.c: Don't export local functions
        clocksource: start CMT at clocksource resume
        clocksource: add suspend callback
        clocksource: add argument to resume callback
        ntp: Cleanup xtime references in ntp.c
        ntp: Make time_esterror and time_maxerror static
      e56425b1
    • R
      scsi.c: add missing kernel-doc notation for new VPD parameters · 786f8ba2
      Randy Dunlap 提交于
      Add missing kernel-doc notation for new function parameters:
      
      Warning(drivers/scsi/scsi.c:1031): No description found for parameter 'buf'
      Warning(drivers/scsi/scsi.c:1031): No description found for parameter 'buf_len'
      Signed-off-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Cc: James Bottomley <James.Bottomley@suse.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      786f8ba2
  2. 01 3月, 2010 33 次提交