1. 05 2月, 2014 33 次提交
  2. 27 1月, 2014 3 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml · 77d143de
      Linus Torvalds 提交于
      Pull UML changes from Richard Weinberger:
       "This time only various cleanups and housekeeping patches"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
        um: hostfs: make functions static
        um: Include generic barrier.h
        um: Removed unused attributes from thread_struct
      77d143de
    • L
      Merge tag 'mmc-updates-for-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc · ccc039d6
      Linus Torvalds 提交于
      Pull MMC updates from Chris Ball:
       "MMC highlights for 3.14:
      
        Core:
         - Avoid get_cd() on cards marked nonremovable
      
        Drivers:
         - arasan: New driver for controllers found in e.g. Xilinx Zynq SoC
         - dwmmc: Support Hisilicon K3 SoC controllers
         - esdhc-imx: Support for HS200 mode, DDR modes on MX6, runtime PM
         - sdhci-pci: Support O2Micro/BayHubTech controllers used in laptops
           like Lenovo ThinkPad W540, Dell Latitude E5440, Dell Latitude E6540
         - tegra: Support Tegra124 SoCs"
      
      * tag 'mmc-updates-for-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (55 commits)
        mmc: sdhci-pci: Fix possibility of chip->fixes being null
        mmc: sdhci-pci: Fix BYT sd card getting stuck in runtime suspend
        mmc: sdhci: Allow for long command timeouts
        mmc: sdio: add a quirk for broken SDIO_CCCR_INTx polling
        mmc: sdhci: fix lockdep error in tuning routine
        mmc: dw_mmc: k3: remove clk_table
        mmc: dw_mmc: fix dw_mci_get_cd
        mmc: dw_mmc: fix sparse non static symbol warning
        mmc: sdhci-esdhc-imx: fix warning during module remove function
        mmc: sdhci-esdhc-imx: fix access hardirq-unsafe lock in atomic context
        mmc: core: sd: implement proper support for sd3.0 au sizes
        mmc: atmel-mci: add vmmc-supply support
        mmc: sdhci-pci: add broken HS200 quirk for Intel Merrifield
        mmc: sdhci: add quirk for broken HS200 support
        mmc: arasan: Add driver for Arasan SDHCI
        mmc: dw_mmc: add dw_mmc-k3 for k3 platform
        mmc: dw_mmc: use slot-gpio to handle cd pin
        mmc: sdhci-pci: add support of O2Micro/BayHubTech SD hosts
        mmc: sdhci-pci: break out definitions to header file
        mmc: tmio: fixup compile error
        ...
      
      Conflicts:
      	MAINTAINERS
      ccc039d6
    • L
      Merge tag 'for-3.14-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · 1c294838
      Linus Torvalds 提交于
      Pull 9p changes from Eric Van Hensbergen:
       "Included are a new cache model for support of mmap, and several
        cleanups across the filesystem and networking portions of the code"
      
      * tag 'for-3.14-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
        9p: update documentation
        9P: introduction of a new cache=mmap model.
        net/9p: remove virtio default hack and set appropriate bits instead
        9p: remove useless 'name' variable and assignment
        9p: fix return value in case in v9fs_fid_xattr_set()
        9p: remove useless variable and assignment
        9p: remove useless assignment
        9p: remove unused 'super_block' struct pointer
        9p: remove never used return variable
        9p: remove unused 'p9_fid' struct pointer
        9p: remove unused 'p9_client' struct pointer
      1c294838
  3. 26 1月, 2014 4 次提交