1. 22 3月, 2011 1 次提交
  2. 21 3月, 2011 6 次提交
  3. 20 3月, 2011 13 次提交
  4. 19 3月, 2011 20 次提交
    • D
      Merge branch 'next' into for-linus · 97eb3f24
      Dmitry Torokhov 提交于
      97eb3f24
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 · 5bab188a
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
        nilfs2: move NILFS_SUPER_MAGIC to linux/magic.h
        nilfs2: get rid of nilfs_sb_info structure
        nilfs2: use sb instance instead of nilfs_sb_info struct
        nilfs2: get rid of sc_sbi back pointer
        nilfs2: move log writer onto nilfs object
        nilfs2: move next generation counter into nilfs object
        nilfs2: move s_inode_lock and s_dirty_files into nilfs object
        nilfs2: move parameters on nilfs_sb_info into nilfs object
        nilfs2: move mount options to nilfs object
        nilfs2: record used amount of each checkpoint in checkpoint list
        nilfs2: optimize rec_len functions
        nilfs2: append blocksize info to warnings during loading super blocks
        nilfs2: add compat ioctl
        nilfs2: implement FS_IOC_GETFLAGS/SETFLAGS/GETVERSION
        nilfs2: tighten restrictions on inode flags
        nilfs2: mark S_NOATIME on inodes only if NOATIME attribute is set
        nilfs2: use common file attribute macros
        nilfs2: add free entries count only if clear bit operation succeeded
        nilfs2: decrement inodes count only if raw inode was successfully deleted
      5bab188a
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc · a8c91da5
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (53 commits)
        mmc: dw_mmc: support mmc power control with regulator
        mmc: dw_mmc: fix suspend/resume operation
        mmc: dw_mmc: add quirks for unreliable card detect, and capabilities
        mmc: tmio: fix address in kunmap_atomic() calls
        mmc: core: reset card voltage after power off
        mmc: core: export function mmc_do_release_host()
        mmc: sdio: remember new card RCA when redetecting card
        mmc: dw_mmc: Remove set-but-unused variable.
        mmc: sdhci-esdhc-imx: add card detect on custom GPIO for mx25/35
        mmc: sdhci-esdhc: broken card detection is not a default quirk
        mmc: sdhci-esdhc-imx: add write protect on custom GPIO on mx25/35
        mmc: msm_sdcc: remove needless cache flush after dma_unmap_sg()
        mmc: sh_mmcif: support aggressive clock gating
        mmc: check if mmc cards < 2GB do sector addressing
        mmc: core: comment on why sdio_reset is done at init time
        mmc: dw_mmc: support DDR mode
        mmc: via-sdmmc: Remove set-but-unused variable.
        mmc: cb710: Return err value in cb710_wait_while_busy()
        mmc: sdhci-pci: Remove set-but-unused variable.
        mmc: mxs-mmc: add mmc host driver for i.MX23/28
        ...
      a8c91da5
    • L
      Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · 26b95cac
      Linus Torvalds 提交于
      * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
        USB: Move runtime PM callbacks to usb_device_pm_ops
      26b95cac
    • L
      Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300 · 2c1d2470
      Linus Torvalds 提交于
      * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300:
        MN10300: Clear ASB2364 peripheral interrupt masks before enabling interrupts
        MN10300: Fix the ASB2364 gdbport UART register defs
        MN10300: Fix ASB2364 FPGA register defs
        MN10300: Select GENERIC_HARDIRQS_NO_DEPRECATED
        MN10300: Select HAVE_GENERIC_HARDIRQS rather than GENERIC_HARDIRQS
        MN10300: Convert ASB2364 FPGA irq_chip to new functions
        MN10300: Convert ipi irq_chip to new functions
        MN10300: Convert serial irq_chip to new functions
        MN10300: Convert cpu irq_chips to new functions
        MN10300: Remove unused mn10300_intc_* functions
        MN10300: Remove stale irq_chip.end - V2
        MN10300: Use clockevents_calc_mult_shift()
        MN10300: Use clocksource_register_hz()
        MN10300: Remove stale code
      2c1d2470
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin · 664322a4
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (32 commits)
        Blackfin: ip0x: fix unused variable warning
        Blackfin: punt unused HDMA masks
        Blackfin: wire up new syscalls
        Blackfin/ipipe: restore pipeline bits in irqflags
        Blackfin/ipipe: fix deferred pipeline sync for the root stage
        Blackfin/ipipe: upgrade to I-pipe mainline
        Blackfin: cpufreq: fix typos
        Blackfin: enable GENERIC_HARDIRQS_NO_DEPRECATED
        Blackfin: SMP: convert to irq chip functions
        Blackfin: use accessor functions in show_interrupts()
        Blackfin: use proper wrapper functions for modifying irq status
        Blackfin: convert gpio irq_chip to new functions
        Blackfin: convert mac irq_chip to new functions
        Blackfin: convert error irq_chip to new functions
        Blackfin: convert internal irq_chip to new functions
        Blackfin: convert core irq_chip to new functions
        Blackfin: use proper wrappers for irq_desc
        Blackfin: optimize startup code
        Blackfin: SMP: work around anomaly 05000491
        Blackfin: SMP: implement cpu_freq support
        ...
      664322a4
    • R
      USB: Move runtime PM callbacks to usb_device_pm_ops · e1620d59
      Rafael J. Wysocki 提交于
      USB defines usb_device_type pointing to usb_device_pm_ops that
      provides system-wide PM callbacks only and usb_bus_type pointing to
      usb_bus_pm_ops that provides runtime PM callbacks only.  However,
      the USB runtime PM callbacks may be defined in usb_device_pm_ops
      which makes it possible to drop usb_bus_pm_ops and will allow us
      to consolidate the handling of subsystems by the PM core code.
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      Acked-by: NGreg Kroah-Hartman <gregkh@suse.de>
      e1620d59
    • L
      Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · 99759619
      Linus Torvalds 提交于
      * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
        PCI: label: remove #include of ACPI header to avoid warnings
        PCI: label: Fix compilation error when CONFIG_ACPI is unset
        PCI: pre-allocate additional resources to devices only after successful allocation of essential resources.
        PCI: introduce reset_resource()
        PCI: data structure agnostic free list function
        PCI: refactor io size calculation code
        PCI: do not create quirk I/O regions below PCIBIOS_MIN_IO for ICH
        PCI hotplug: acpiphp: set current_state to D0 in register_slot
        PCI: Export ACPI _DSM provided firmware instance number and string name to sysfs
        PCI: add more checking to ICH region quirks
        PCI: aer-inject: Override PCIe AER Mask Registers
        PCI: fix tlan build when CONFIG_PCI is not enabled
        PCI: remove quirk for pre-production systems
        PCI: Avoid potential NULL pointer dereference in pci_scan_bridge
        PCI/lpc: irq and pci_ids patch for Intel DH89xxCC DeviceIDs
        PCI: sysfs: Fix failure path for addition of "vpd" attribute
      99759619
    • L
      Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 · b061c59c
      Linus Torvalds 提交于
      * 'spi/next' of git://git.secretlab.ca/git/linux-2.6: (34 commits)
        spi/dw_spi: move dw_spi.h into drivers/spi
        spi/dw_spi: Fix missing header
        gpio/langwell: Clear edge bit before handling
        gpio/langwell: Simplify demux loop
        gpio/langwell: Convert irq name space
        gpio/langwell: Fix broken irq_eoi change.
        gpio; Make Intel chipset gpio drivers depend on x86
        gpio/cs5535-gpio: Fix section mismatch
        spi/rtc-{ds1390,ds3234,m41t94}: Use spi_get_drvdata() for SPI devices
        spi/davinci: Support DMA transfers larger than 65535 words
        spi/davinci: Use correct length parameter to dma_map_single calls
        gpio: Use __devexit at necessary places
        gpio: add MODULE_DEVICE_TABLE to pch_gpio and ml_ioh_gpio
        gpio/mcp23s08: support mcp23s17 variant
        of_mmc_spi: add card detect irq support
        spi/omap_mcspi: catch xfers of non-multiple SPI word size
        spi/omap_mcspi: Off-by-one error in finding the right divisor
        gpio/pca953x: Fix wrong pointer type
        spi/pl022: rid dangling labels
        spi: add support for SuperH SPI
        ...
      b061c59c
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm · 99f4065b
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
        dlm: use alloc_workqueue function
        dlm: increase default hash table sizes
        dlm: record full callback state
      99f4065b
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 · f539abec
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
        fs: call security_d_instantiate in d_obtain_alias V2
        lose 'mounting_here' argument in ->d_manage()
        don't pass 'mounting_here' flag to follow_down()
        change the locking order for namespace_sem
        fix deadlock in pivot_root()
        vfs: split off vfsmount-related parts of vfs_kern_mount()
        Some fixes for pstore
        kill simple_set_mnt()
      f539abec
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs · 3f6f7e6d
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs:
        omfs: make readdir stop when filldir says so
        omfs: merge unlink() and rmdir(), close leak in rename()
        omfs: stop playing silly buggers with omfs_unlink() in ->rename()
        omfs: rename() needs to mark old_inode dirty after ctime update
      3f6f7e6d
    • L
      Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 · 8f627a8a
      Linus Torvalds 提交于
      * 'linux-next' of git://git.infradead.org/ubifs-2.6: (25 commits)
        UBIFS: clean-up commentaries
        UBIFS: save 128KiB or more RAM
        UBIFS: allocate orphans scan buffer on demand
        UBIFS: allocate lpt dump buffer on demand
        UBIFS: allocate ltab checking buffer on demand
        UBIFS: allocate scanning buffer on demand
        UBIFS: allocate dump buffer on demand
        UBIFS: do not check data crc by default
        UBIFS: simplify UBIFS Kconfig menu
        UBIFS: print max. index node size
        UBIFS: handle allocation failures in UBIFS write path
        UBIFS: use max_write_size during recovery
        UBIFS: use max_write_size for write-buffers
        UBIFS: introduce write-buffer size field
        UBI: incorporate LEB offset information
        UBIFS: incorporate maximum write size
        UBI: provide LEB offset information
        UBI: incorporate maximum write size
        UBIFS: fix LEB number in printk
        UBIFS: restrict world-writable debugfs files
        ...
      8f627a8a
    • L
      Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 · fd57ed02
      Linus Torvalds 提交于
      * 'linux-next' of git://git.infradead.org/ubi-2.6:
        UBI: make tests modes dynamic
        UBI: make self-checks dynamic
        UBI: make debugging messages dynamic
        UBI: remove UBI_IO_DEBUG macro
        UBI: kill debugging buffer
        UBI: allocate erase checking buffer on demand
        UBI: allocate write checking buffer on demand
        UBI: always re-read in case of read failures
        UBI: cleanup comments about corrupted PEBs
        UBI: add slab cache for ubi_scan_leb objects
        UBI: use raw mtd read function in debugging code
        UBI: try to reveal buggy MTD drivers
        UBI: add a commentary about allocating VID header buffer on stack
        UBI: cleanup LEB start calculations
        UBI: fix NOR erase preparation quirk
      fd57ed02
    • A
      MAINTAINERS: Add serial · ca749e2a
      Alan Cox 提交于
      Add an entry for serial maintainers.
      Signed-off-by: NAlan Cox <alan@linux.intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ca749e2a
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · d3e458d7
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (308 commits)
        ALSA: sound/pci/asihpi: check adapter index in hpi_ioctl
        ALSA: aloop - Fix possible IRQ lock inversion
        ALSA: sound/core: merge list_del()/list_add_tail() to list_move_tail()
        ALSA: ctxfi - use list_move() instead of list_del()/list_add() combination
        ALSA: firewire - msleep needs delay.h
        ALSA: firewire-lib, firewire-speakers: handle packet queueing errors
        ALSA: firewire-lib: allocate DMA buffer separately
        ALSA: firewire-lib: use no-info SYT for packets without SYT sample
        ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver
        ALSA: hda - Remove an unused variable in patch_realtek.c
        ALSA: hda - pin-adc-mux-dmic auto-configuration of 92HD8X codecs
        ALSA: hda - fix digital mic selection in mixer on 92HD8X codecs
        ALSA: hda - Move default input-src selection to init part
        ALSA: hda - Initialize special cases for input src in init phase
        ALSA: ctxfi - Clear input settings before initialization
        ALSA: ctxfi - Fix SPDIF status retrieval
        ALSA: ctxfi - Fix incorrect SPDIF status bit mask
        ALSA: ctxfi - Fix microphone boost codes/comments
        ALSA: atiixp - Fix wrong time-out checks during ac-link reset
        ALSA: intel8x0m: append 'm' to "r_intel8x0"
        ...
      d3e458d7
    • L
      Merge branch 'x86-fixes-for-linus' of... · f2e1fbb5
      Linus Torvalds 提交于
      Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Flush TLB if PGD entry is changed in i386 PAE mode
        x86, dumpstack: Correct stack dump info when frame pointer is available
        x86: Clean up csum-copy_64.S a bit
        x86: Fix common misspellings
        x86: Fix misspelling and align params
        x86: Use PentiumPro-optimized partial_csum() on VIA C7
      f2e1fbb5
    • L
      Merge branches 'irq-fixes-for-linus' and 'sched-fixes-for-linus' of... · 508996b6
      Linus Torvalds 提交于
      Merge branches 'irq-fixes-for-linus' and 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        genirq: Fix incorrect unlock in __setup_irq()
        cris: Use generic show_interrupts()
        genirq: show_interrupts: Check desc->name before printing it blindly
        cris: Use accessor functions to set IRQ_PER_CPU flag
        cris: Fix irq conversion fallout
      
      * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        sched, kernel-doc: Fix runqueue_is_locked() description
      508996b6
    • L
      Merge branch 'perf-fixes-for-linus' of... · 61929785
      Linus Torvalds 提交于
      Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)
        trace, filters: Initialize the match variable in process_ops() properly
        trace, documentation: Fix branch profiling location in debugfs
        oprofile, s390: Cleanups
        oprofile, s390: Remove hwsampler_files.c and merge it into init.c
        perf: Fix tear-down of inherited group events
        perf: Reorder & optimize perf_event_context to remove alignment padding on 64 bit builds
        perf: Handle stopped state with tracepoints
        perf: Fix the software events state check
        perf, powerpc: Handle events that raise an exception without overflowing
        perf, x86: Use INTEL_*_CONSTRAINT() for all PEBS event constraints
        perf, x86: Clean up SandyBridge PEBS events
        perf lock: Fix sorting by wait_min
        perf tools: Version incorrect with some versions of grep
        perf evlist: New command to list the names of events present in a perf.data file
        perf script: Add support for H/W and S/W events
        perf script: Add support for dumping symbols
        perf script: Support custom field selection for output
        perf script: Move printing of 'common' data from print_event and rename
        perf tracing: Remove print_graph_cpu and print_graph_proc from trace-event-parse
        perf script: Change process_event prototype
        ...
      61929785
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · e16b396c
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)
        doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
        Update cpuset info & webiste for cgroups
        dcdbas: force SMI to happen when expected
        arch/arm/Kconfig: remove one to many l's in the word.
        asm-generic/user.h: Fix spelling in comment
        drm: fix printk typo 'sracth'
        Remove one to many n's in a word
        Documentation/filesystems/romfs.txt: fixing link to genromfs
        drivers:scsi Change printk typo initate -> initiate
        serial, pch uart: Remove duplicate inclusion of linux/pci.h header
        fs/eventpoll.c: fix spelling
        mm: Fix out-of-date comments which refers non-existent functions
        drm: Fix printk typo 'failled'
        coh901318.c: Change initate to initiate.
        mbox-db5500.c Change initate to initiate.
        edac: correct i82975x error-info reported
        edac: correct i82975x mci initialisation
        edac: correct commented info
        fs: update comments to point correct document
        target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
        ...
      
      Trivial conflict in fs/eventpoll.c (spelling vs addition)
      e16b396c