1. 31 1月, 2012 10 次提交
  2. 30 1月, 2012 5 次提交
  3. 29 1月, 2012 7 次提交
    • L
      Merge tag 'driver-core-3.3-rc1-bugfixes' of... · 0a962657
      Linus Torvalds 提交于
      Merge tag 'driver-core-3.3-rc1-bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
      
      Here are some patches for the 3.3-rc1 tree.
      
      It contains the removal of the sysdev code, now that all users of it are
      gone, as well as some sysfs bugfixes that have been reported by users.
      There are also some documentation updates here as well.
      
      * tag 'driver-core-3.3-rc1-bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        sysfs: Complain bitterly about attempts to remove files from nonexistent directories.
        stable: update documentation to ask for kernel version
        base/core.c:fix typo in comment in function device_add
        Documentation: devres: add allocation functions to list of supported calls
        Documentation update for the driver model core
        kernel-doc: fix new warnings in driver-core
        kernel-doc: fix new warnings in debugfs
        kernel-doc: fix new warnings in device.h
        driver core: remove drivers/base/sys.c and include/linux/sysdev.h
      0a962657
    • L
      Merge tag 'for-linus' of git://github.com/rustyrussell/linux · e3b8369c
      Linus Torvalds 提交于
      * tag 'for-linus' of git://github.com/rustyrussell/linux:
        lguest: remove reference from Documentation/virtual/00-INDEX
        virtio: correct the memory barrier in virtqueue_kick_prepare()
        virtio: fix typos of memory barriers
      e3b8369c
    • L
      Merge branch 'stable/for-linus-fixes-3.3' of... · 6c334f4f
      Linus Torvalds 提交于
      Merge branch 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      * 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/granttable: Disable grant v2 for HVM domains.
        x86: xen: size struct xen_spinlock to always fit in arch_spinlock_t
      6c334f4f
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 67d2433e
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: fix reservations in btrfs_page_mkwrite
        Btrfs: advance window_start if we're using a bitmap
        btrfs: mask out gfp flags in releasepage
        Btrfs: fix enospc error caused by wrong checks of the chunk
        Btrfs: do not defrag a file partially
        Btrfs: fix warning for 32-bit build of fs/btrfs/check-integrity.c
        Btrfs: use cluster->window_start when allocating from a cluster bitmap
        Btrfs: Check for NULL page in extent_range_uptodate
        btrfs: Fix busyloops in transaction waiting code
        Btrfs: make sure a bitmap has enough bytes
        Btrfs: fix uninit warning in backref.c
      67d2433e
    • L
      Merge git://www.linux-watchdog.org/linux-watchdog · 1c36ab1a
      Linus Torvalds 提交于
      * git://www.linux-watchdog.org/linux-watchdog:
        watchdog: iTCO_wdt: add Intel Lynx Point DeviceIDs
        watchdog: via_wdt: Set min_timeout and max_timeout for wdt_dev
        watchdog: Fix typo "unexpectdly"
        watchdog: wafer5823wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options
        watchdog: wm8350_wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options
        watchdog: Return proper error in nuc900wdt_probe if misc_register fails
        watchdog: Staticise nuc900_wdt
        watchdog: via_wdt: Staticise wdt_pci_table
        watchdog: omap_wdt.c: Fix the mismatch of pm_runtime enable and disable
        watchdog: dw_wdt.c: use devm_request_and_ioremap
        watchdog: imx2_wdt.c: use devm_request_and_ioremap
      1c36ab1a
    • L
      Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm · deb9b4ce
      Linus Torvalds 提交于
      * 'fixes' of git://git.linaro.org/people/rmk/linux-arm: (31 commits)
        ARM: 7304/1: ioremap: fix boundary check when reusing static mapping
        ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts
        ARM: 7299/1: ftrace: clear zero bit in reported IPs for Thumb-2
        ARM: 7298/1: realview: fix mapping of MPCore private memory region
        PCMCIA: fix sa1111 oops on remove
        ARM: 7288/1: mach-sa1100: add missing module_init() call
        ARM: 7297/1: smp_twd: make sure timer is stopped before registering it
        ARM: 7296/1: proc-v7.S: remove HARVARD_CACHE preprocessor guards
        ARM: 7295/1: cortex-a7: move proc_info out of !CONFIG_ARM_LPAE block
        ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP
        ARM: 7291/1: cache: assume 64-byte L1 cachelines for ARMv7 CPUs
        ARM: 7290/1: vmlinux.lds.S: align the exception fixup table to a 4-byte boundary
        ARM: 7289/1: vmlinux.lds.S: do not hardcode cacheline size as 32 bytes
        MFD: ucb1x00-ts: fix resume failure
        MFD: ucb1x00-core: fix gpiolib direction_output handling
        MFD: ucb1x00-core: fix missing restore of io output data on resume
        MFD: mcp-core: fix mcp_priv() to be more type safe
        MFD: mcp-core: fix complaints from the genirq layer
        Revert "ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus."
        Revert "ARM: sa1100: Refactor mcp-sa11x0 to use platform resources."
        ...
      
      Fix up conflict due to arch/arm/mach-mx5/Kconfig having been merged into
      mach-imx5 (commit 784a90c0: "ARM i.MX: Merge i.MX5 support into
      mach-imx"), but the ARM_L1_CACHE_SHIFT_6 entry was moved to be driven by
      the CPU_V7 logic from it in the old location in rmk's branch (commit
      a092f2b1: "ARM: 7291/1: cache: assume 64-byte L1 cachelines for
      ARMv7 CPUs").
      deb9b4ce
    • L
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 81bc3009
      Linus Torvalds 提交于
      arm-soc fixes for 3.3-rc:
      
      AT91 needed reset fixes which resulted in some minor code refactoring,
      it also adds a feature-removal for one of their platforms for 3.4.
      The USB patches have been acked by Greg K-H.
      
      i.MX and ux500 both have some minor fixes, nothing controversial.
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        arch/arm/mach-imx/mach-mx53_ard.c: add missing iounmap
        ARM: imx: iomux-v1.h: Fix build error due to __init annotation
        ARM: at91: Fix at91sam9g45 and at91cap9 reset
        ARM: at91: make rstc soc independent
        ARM: at91: introduce AT91_SAM9_ALT_RESET to select the at91sam9 alternative reset
        ARM: at91: merge at91cap9_ddrsdr.h in at91sam9_ddrsdr.h
        ARM: at91: fix cap9 ddrsdr register
        ARM/USB: at91/ohci-at91: rename vbus_pin_inverted to vbus_pin_active_low
        USB: at91: fix clk_get error handling
        ARM: at91: removal of CAP9 SoC family
        ARM: at91: fix at91rm9200 soc subtype handling
        mach-ux500: no MMC_CAP_SD_HIGHSPEED on Snowball
        mach-ux500: enable ARM errata 764369
        mach-ux500: do not override outer.inv_all
        mach-ux500: musb: now musb is always in OTG mode
        ARM: imx6: add missing twd_clk for imx6q clock
      81bc3009
  4. 28 1月, 2012 9 次提交
  5. 27 1月, 2012 9 次提交