1. 21 3月, 2011 16 次提交
  2. 20 3月, 2011 13 次提交
  3. 19 3月, 2011 11 次提交
    • 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