Skip to content
  1. Nov 08, 2011
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux · 3c003032
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
        cpuidle: Single/Global registration of idle states
        cpuidle: Split cpuidle_state structure and move per-cpu statistics fields
        cpuidle: Remove CPUIDLE_FLAG_IGNORE and dev->prepare()
        cpuidle: Move dev->last_residency update to driver enter routine; remove dev->last_state
        ACPI: Fix CONFIG_ACPI_DOCK=n compiler warning
        ACPI: Export FADT pm_profile integer value to userspace
        thermal: Prevent polling from happening during system suspend
        ACPI: Drop ACPI_NO_HARDWARE_INIT
        ACPI atomicio: Convert width in bits to bytes in __acpi_ioremap_fast()
        PNPACPI: Simplify disabled resource registration
        ACPI: Fix possible recursive locking in hwregs.c
        ACPI: use kstrdup()
        mrst pmu: update comment
        tools/power turbostat: less verbose debugging
      3c003032
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 83dbb15e
      Linus Torvalds authored
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (40 commits)
        vmwgfx: Snoop DMA transfers with non-covering sizes
        vmwgfx: Move the prefered mode first in the list
        vmwgfx: Unreference surface on cursor error path
        vmwgfx: Free prefered mode on error path
        vmwgfx: Use pointer return error codes
        vmwgfx: Fix hw cursor position
        vmwgfx: Infrastructure for explicit placement
        vmwgfx: Make the preferred autofit mode have a 60Hz vrefresh
        vmwgfx: Remove screen object active list
        vmwgfx: Screen object cleanups
        drm/radeon/kms: consolidate GART code, fix segfault after GPU lockup V2
        drm/radeon/kms: don't poll forever if MC GDDR link training fails
        drm/radeon/kms: fix DP setup on TRAVIS bridges
        drm/radeon/kms: set HPD polarity in hpd_init()
        drm/radeon/kms: add MSI module parameter
        drm/radeon/kms: Add MSI quirk for Dell RS690
        drm/radeon/kms: Add MSI quirk for HP RS690
        drm/radeon/kms: split MSI check into a separate function
        vmwgfx: Reinstate the update_layout ioctl
        drm/radeon/kms: always do extended edid probe
        ...
      83dbb15e
    • Linus Torvalds's avatar
      Merge branch 'urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux · 6e6bc679
      Linus Torvalds authored
      * 'urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
        writeback: fix uninitialized task_ratelimit
      6e6bc679
    • Linus Torvalds's avatar
      Merge git://git.samba.org/sfrench/cifs-2.6 · ff4d7fa8
      Linus Torvalds authored
      * git://git.samba.org/sfrench/cifs-2.6:
        CIFS: Cleanup byte-range locking code style
        CIFS: Simplify setlk error handling for mandatory locking
      ff4d7fa8
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/mtd-2.6 · e0d65113
      Linus Torvalds authored
      * git://git.infradead.org/mtd-2.6: (226 commits)
        mtd: tests: annotate as DANGEROUS in Kconfig
        mtd: tests: don't use mtd0 as a default
        mtd: clean up usage of MTD_DOCPROBE_ADDRESS
        jffs2: add compr=lzo and compr=zlib options
        jffs2: implement mount option parsing and compression overriding
        mtd: nand: initialize ops.mode
        mtd: provide an alias for the redboot module name
        mtd: m25p80: don't probe device which has status of 'disabled'
        mtd: nand_h1900 never worked
        mtd: Add DiskOnChip G3 support
        mtd: m25p80: add EON flash EN25Q32B into spi flash id table
        mtd: mark block device queue as non-rotational
        mtd: r852: make r852_pm_ops static
        mtd: m25p80: add support for at25df321a spi data flash
        mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks
        mtd: nand: switch `check_pattern()' to standard `memcmp()'
        mtd: nand: invalidate cache on unaligned reads
        mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set
        mtd: nand: wait to set BBT version
        mtd: nand: scrub BBT on ECC errors
        ...
      
      Fix up trivial conflicts:
       - arch/arm/mach-at91/board-usb-a9260.c
      	Merged into board-usb-a926x.c
       - drivers/mtd/maps/lantiq-flash.c
      	add_mtd_partitions -> mtd_device_register vs changed to use
      	mtd_device_parse_register.
      e0d65113
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 · cf5e15fb
      Linus Torvalds authored
      * 'linux-next' of git://git.infradead.org/ubifs-2.6:
        UBIFS: fix the dark space calculation
        UBIFS: introduce a helper to dump scanning info
      cf5e15fb
  2. Nov 07, 2011