21 Mar, 2011

3 commits

  • * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits)
    video: change to new flag variable
    scsi: change to new flag variable
    rtc: change to new flag variable
    rapidio: change to new flag variable
    pps: change to new flag variable
    net: change to new flag variable
    misc: change to new flag variable
    message: change to new flag variable
    memstick: change to new flag variable
    isdn: change to new flag variable
    ieee802154: change to new flag variable
    ide: change to new flag variable
    hwmon: change to new flag variable
    dma: change to new flag variable
    char: change to new flag variable
    fs: change to new flag variable
    xtensa: change to new flag variable
    um: change to new flag variables
    s390: change to new flag variable
    mips: change to new flag variable
    ...

    Fix up trivial conflict in drivers/hwmon/Makefile

    Linus Torvalds
     
  • * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    i2c-i801: SMBus patch for Intel DH89xxCC DeviceIDs
    i2c: Drop i2c_adapter.id
    i2c: Deprecate i2c_driver.attach_adapter and .detach_adapter
    i2c-dev: Use standard bus notification mechanism
    i2c: Export i2c_for_each_dev
    i2c: Get rid of
    i2c: Minor fixes to upgrading-clients document
    i2c: make i2c_get_adapter prototype clearer
    i2c: Fix typo in instantiating-devices document
    i2c-boardinfo: Fix typo in comment

    Linus Torvalds
     
  • commit 54405cde7624 (r8169: support control of advertising.)
    introduced a bug in rtl8169_init_phy()

    Reported-and-tested-by: Piotr Hosowicz
    Reported-and-tested-by: Linus Torvalds
    Signed-off-by: Eric Dumazet
    Acked-by:: Oliver Neukum
    Cc: Francois Romieu
    Tested-by: Anca Emanuel
    Signed-off-by: Linus Torvalds

    Eric Dumazet
     

20 Mar, 2011

7 commits

  • Add the SMBus Controller DeviceIDs for the Intel DH89xxCC PCH.

    Signed-off-by: Seth Heasley
    Signed-off-by: Jean Delvare

    Seth Heasley
     
  • The last legitimate user of i2c_driver.attach_adapter and
    .detach_adapter is gone, so we can finally deprecate these callbacks.
    The last few drivers which still use these will have to be updated to
    make use of standard I2C device instantiation ways instead.

    Signed-off-by: Jean Delvare

    Jean Delvare
     
  • Use the standard driver core mechanism to keep track of i2c adapters
    present on the system: i2c_for_each_dev and a notifier. This will let
    us deprecate and ultimately remove the legacy attach_adapter and
    detach_adapter callbacks in i2c_driver.

    Signed-off-by: Jean Delvare

    Jean Delvare
     
  • Introduce i2c_for_each_dev(), an i2c device iterator with proper
    locking for use by i2c-dev. This is needed so that we can get rid of
    the attach_adapter and detach_adapter legacy callback functions.

    Signed-off-by: Jean Delvare

    Jean Delvare
     
  • Rename the parameter of i2c_get_adapter() to "nr", to make it clear we
    are passing an adapter number and not an adapter ID (which have gone
    away by now.)

    Signed-off-by: Jean Delvare

    Jean Delvare
     
  • Signed-off-by: Wolfram Sang
    Signed-off-by: Jean Delvare

    Wolfram Sang
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (64 commits)
    Input: tsc2005 - remove 'disable' sysfs attribute
    Input: tsc2005 - add open/close
    Input: tsc2005 - handle read errors from SPI layer
    Input: tsc2005 - do not rearm timer in hardirq handler
    Input: tsc2005 - don't use work for 'pen up' handling
    Input: tsc2005 - do not use 0 in place of NULL
    Input: tsc2005 - use true/false for boolean variables
    Input: tsc2005 - hide selftest attribute if we can't reset
    Input: tsc2005 - rework driver initialization code
    Input: tsc2005 - set up bus type in input device
    Input: tsc2005 - set up parent device
    Input: tsc2005 - clear driver data after unbinding
    Input: tsc2005 - add module description
    Input: tsc2005 - remove driver banner message
    Input: tsc2005 - remove incorrect module alias
    Input: tsc2005 - convert to using dev_pm_ops
    Input: tsc2005 - use spi_get/set_drvdata()
    Input: introduce tsc2005 driver
    Input: xen-kbdfront - move to drivers/input/misc
    Input: xen-kbdfront - add grant reference for shared page
    ...

    Linus Torvalds
     

19 Mar, 2011

12 commits

  • Dmitry Torokhov
     
  • * '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
    ...

    Linus Torvalds
     
  • 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: Rafael J. Wysocki
    Acked-by: Greg Kroah-Hartman

    Rafael J. Wysocki
     
  • * '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

    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
    ...

    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
    ...

    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

    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"
    ...

    Linus Torvalds
     
  • …/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
    ...

    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)

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (48 commits)
    HID: add support for Logitech Driving Force Pro wheel
    HID: hid-ortek: remove spurious reference
    HID: add support for Ortek PKB-1700
    HID: roccat-koneplus: vorrect mode of sysfs attr 'sensor'
    HID: hid-ntrig: init settle and mode check
    HID: merge hid-egalax into hid-multitouch
    HID: hid-multitouch: Send events per slot if CONTACTCOUNT is missing
    HID: ntrig remove if and drop an indent
    HID: ACRUX - activate the device immediately after binding
    HID: ntrig: apply NO_INIT_REPORTS quirk
    HID: hid-magicmouse: Correct touch orientation direction
    HID: ntrig don't dereference unclaimed hidinput
    HID: Do not create input devices for feature reports
    HID: bt hidp: send Output reports using SET_REPORT on the Control channel
    HID: hid-sony.c: Fix sending Output reports to the Sixaxis
    HID: add support for Keytouch IEC 60945
    HID: Add HID Report Descriptor to sysfs
    HID: add IRTOUCH infrared USB to hid_have_special_driver
    HID: kernel oops in out_cleanup in function hidinput_connect
    HID: Add teletext/color keys - gyration remote - EU version (GYAR3101CKDE)
    ...

    Linus Torvalds
     
  • include/linux/dw_spi.h only includes driver internal data. It doesn't
    expose a platform_data configuration structure or similar (at least
    nothing in-tree). This patch moves the header into drivers/spi so
    that the scope is limited to only the dw_spi_*.c driver files

    Signed-off-by: Grant Likely
    Cc: Feng Tang
    Cc: spi-devel-general@lists.sourceforge.net

    Grant Likely
     

18 Mar, 2011

18 commits

  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (62 commits)
    powerpc/85xx: Fix signedness bug in cache-sram
    powerpc/fsl: 85xx: document cache sram bindings
    powerpc/fsl: define binding for fsl mpic interrupt controllers
    powerpc/fsl_msi: Handle msi-available-ranges better
    drivers/serial/ucc_uart.c: Add of_node_put to avoid memory leak
    powerpc/85xx: Fix SPE float to integer conversion failure
    powerpc/85xx: Update sata controller compatible for p1022ds board
    ATA: Add FSL sata v2 controller support
    powerpc/mpc8xxx_gpio: simplify searching for 'fsl, qoriq-gpio' compatiable
    powerpc/8xx: remove obsolete mgsuvd board
    powerpc/82xx: rename and update mgcoge board support
    powerpc/83xx: rename and update kmeter1
    powerpc/85xx: Workaroudn e500 CPU erratum A005
    powerpc/fsl_pci: Add support for FSL PCIe controllers v2.x
    powerpc/85xx: Fix writing to spin table 'cpu-release-addr' on ppc64e
    powerpc/pseries: Disable MSI using new interface if possible
    powerpc: Enable GENERIC_HARDIRQS_NO_DEPRECATED.
    powerpc: core irq_data conversion.
    powerpc: sysdev/xilinx_intc irq_data conversion.
    powerpc: sysdev/uic irq_data conversion.
    ...

    Fix up conflicts in arch/powerpc/sysdev/fsl_msi.c (due to getting rid of
    of_platform_driver in arch/powerpc)

    Linus Torvalds
     
  • I don't have the specs for this beast, but it looks a lot like the PXA
    GPIO block. Though I bet it's the same IP and the driver should have
    reused the PXA code.

    Acknowleding the edge detect status after handling one or more gpio
    interrupts looks wrong. We might lose an edge which came in while we
    handled the previous one.

    Signed-off-by: Thomas Gleixner
    Acked-by: Alek Du
    Signed-off-by: Grant Likely

    Thomas Gleixner
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: (27 commits)
    arch/tile: support newer binutils assembler shift semantics
    arch/tile: fix deadlock bugs in rwlock implementation
    drivers/edac: provide support for tile architecture
    tile on-chip network driver: sync up with latest fixes
    arch/tile: support 4KB page size as well as 64KB
    arch/tile: add some more VMSPLIT options and use consistent naming
    arch/tile: fix some comments and whitespace
    arch/tile: export some additional module symbols
    arch/tile: enhance existing finv_buffer_remote() routine
    arch/tile: fix two bugs in the backtracer code
    arch/tile: use extended assembly to inline __mb_incoherent()
    arch/tile: use a cleaner technique to enable interrupt for cpu_idle()
    arch/tile: sync up with and changes
    arch/tile: fix reversed test of strict_strtol() return value
    arch/tile: avoid a simulator warning during bootup
    arch/tile: export to userspace
    arch/tile: warn and retry if an IPI is not accepted by the target cpu
    arch/tile: stop disabling INTCTRL_1 interrupts during hypervisor downcalls
    arch/tile: fix __ndelay etc to work better
    arch/tile: bug fix: exec'ed task thought it was still single-stepping
    ...

    Fix up trivial conflict in arch/tile/kernel/vmlinux.lds.S (percpu
    alignment vs section naming convention fix)

    Linus Torvalds
     
  • * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (258 commits)
    omap: zoom: host should not pull up wl1271's irq line
    arm: plat-omap: iommu: fix request_mem_region() error path
    OMAP2+: Common CPU DIE ID reading code reads wrong registers for OMAP4430
    omap4: mux: Remove duplicate mux modes
    omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag
    omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set
    omap2+: mux: Fix compile when CONFIG_OMAP_MUX is not selected
    omap4: board-omap4panda: Initialise the serial pads
    omap3: board-3430sdp: Initialise the serial pads
    omap4: board-4430sdp: Initialise the serial pads
    omap2+: mux: Add macro for configuring static with omap_hwmod_mux_init
    omap2+: mux: Remove the use of IDLE flag
    omap2+: Add separate list for dynamic pads to mux
    perf: add OMAP support for the new power events
    OMAP4: Add IVA OPP enteries.
    OMAP4: Update Voltage Rail Values for MPU, IVA and CORE
    OMAP4: Enable 800 MHz and 1 GHz MPU-OPP
    OMAP3+: OPP: Replace voltage values with Macros
    OMAP3: wdtimer: Fix CORE idle transition
    Watchdog: omap_wdt: add fine grain runtime-pm
    ...

    Fix up various conflicts in
    - arch/arm/mach-omap2/board-omap3evm.c
    - arch/arm/mach-omap2/clock3xxx_data.c
    - arch/arm/mach-omap2/usb-musb.c
    - arch/arm/plat-omap/include/plat/usb.h
    - drivers/usb/musb/musb_core.h

    Linus Torvalds
     
  • * 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm: (46 commits)
    msm: scm: Check for interruption immediately
    msm: scm: Fix improper register assignment
    msm: scm: Mark inline asm as volatile
    msm: iommu: Enable HTW L2 redirection on MSM8960
    msm: iommu: Don't read from write-only registers
    msm: iommu: Remove dependency on IDR
    msm: iommu: Use ASID tagging instead of VMID tagging
    msm: iommu: Rework clock logic and add IOMMU bus clock control
    msm: iommu: Clock control for the IOMMU driver
    msm: mdp: Set the correct pack pattern for XRGB/ARGB
    msm_fb: Fix framebuffer console
    msm: mdp: Add support for RGBX 8888 image format.
    video: msmfb: Put the partial update magic value into the fix_screen struct.
    msm: clock: Migrate to clkdev
    msm: clock: Remove references to clk_ops_pcom
    msm: headsmp.S: Fix section mismatch
    msm: Use explicit GPLv2 licenses
    msm: iommu: Enable IOMMU support for MSM8960
    msm: iommu: Generalize platform data for multiple targets
    msm: iommu: Create a Kconfig item for the IOMMU driver
    ...

    Linus Torvalds
     
  • * 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits)
    davinci: DM644x EVM: register MUSB device earlier
    davinci: add spi devices on tnetv107x evm
    davinci: add ssp config for tnetv107x evm board
    davinci: add tnetv107x ssp platform device
    spi: add ti-ssp spi master driver
    mfd: add driver for sequencer serial port
    ARM: EXYNOS4: Implement Clock gating for System MMU
    ARM: EXYNOS4: Enhancement of System MMU driver
    ARM: EXYNOS4: Add support for gpio interrupts
    ARM: S5P: Add function to register gpio interrupt bank data
    ARM: S5P: Cleanup S5P gpio interrupt code
    ARM: EXYNOS4: Add missing GPYx banks
    ARM: S3C64XX: Fix section mismatch from cpufreq init
    ARM: EXYNOS4: Add keypad device to the SMDKV310
    ARM: EXYNOS4: Update clocks for keypad
    ARM: EXYNOS4: Update keypad base address
    ARM: EXYNOS4: Add keypad device helpers
    ARM: EXYNOS4: Add support for SATA on ARMLEX4210
    plat-nomadik: make GPIO interrupts work with cpuidle ApSleep
    mach-u300: define a dummy filter function for coh901318
    ...

    Fix up various conflicts in
    - arch/arm/mach-exynos4/cpufreq.c
    - arch/arm/mach-mxs/gpio.c
    - drivers/net/Kconfig
    - drivers/tty/serial/Kconfig
    - drivers/tty/serial/Makefile
    - drivers/usb/gadget/fsl_mxc_udc.c
    - drivers/video/Kconfig

    Linus Torvalds
     
  • * 'defcfg' of master.kernel.org:/home/rmk/linux-2.6-arm:
    ARM: 6647/1: add Versatile Express defconfig
    ARM: 6644/1: mach-ux500: update the U8500 defconfig

    * 'drivers' of master.kernel.org:/home/rmk/linux-2.6-arm:
    ARM: 6764/1: pl011: factor out FIFO to TTY code
    ARM: 6763/1: pl011: add optional RX DMA to PL011 v2
    ARM: 6758/1: amba: support pm ops
    ARM: amba: make amba_driver id_table const
    ARM: amba: make internal ID table handling const
    ARM: amba: make probe() functions take const id tables
    ARM: 6662/1: amba: make amba_bustype non-static
    ARM: mmci: add dmaengine-based DMA support
    ARM: mmci: no need for separate host->data_xfered
    ARM: mmci: avoid unnecessary switch to data available PIO interrupts
    ARM: mmci: no need to call flush_dcache_page() with sg_miter API
    ARM: mmci: avoid reporting too many completed bytes on fifo overrun
    ALSA: AACI: make fifo variables more explanitory
    ALSA: AACI: no need to call snd_pcm_period_elapsed() for each period
    ALSA: AACI: use snd_pcm_lib_period_bytes()
    ALSA: AACI: clean up AACI announcement printk
    ALSA: AACI: fix channel mask selection
    ALSA: AACI: fix number of channels for record
    ALSA: AACI: fix multiple IRQ claiming

    * 'cyberpro-next' of master.kernel.org:/home/rmk/linux-2.6-arm:
    VIDEO: cyberpro: remove unused cyber2000fb_get_fb_var()
    VIDEO: cyberpro: remove useless function extreg pointers
    VIDEO: cyberpro: update handling of device structures
    VIDEO: cyberpro: add support for video capture I2C
    VIDEO: cyberpro: make 'reg_b0_lock' always present
    VIDEO: cyberpro: add I2C support
    VIDEO: cyberpro: select lowest multipler/divisor for PLL

    Linus Torvalds
     
  • * 'kvm-updates/2.6.39' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (55 commits)
    KVM: unbreak userspace that does not sets tss address
    KVM: MMU: cleanup pte write path
    KVM: MMU: introduce a common function to get no-dirty-logged slot
    KVM: fix rcu usage in init_rmode_* functions
    KVM: fix kvmclock regression due to missing clock update
    KVM: emulator: Fix permission checking in io permission bitmap
    KVM: emulator: Fix io permission checking for 64bit guest
    KVM: SVM: Load %gs earlier if CONFIG_X86_32_LAZY_GS=n
    KVM: x86: Remove useless regs_page pointer from kvm_lapic
    KVM: improve comment on rcu use in irqfd_deassign
    KVM: MMU: remove unused macros
    KVM: MMU: cleanup page alloc and free
    KVM: MMU: do not record gfn in kvm_mmu_pte_write
    KVM: MMU: move mmu pages calculated out of mmu lock
    KVM: MMU: set spte accessed bit properly
    KVM: MMU: fix kvm_mmu_slot_remove_write_access dropping intermediate W bits
    KVM: Start lock documentation
    KVM: better readability of efer_reserved_bits
    KVM: Clear async page fault hash after switching to real mode
    KVM: VMX: Initialize vm86 TSS only once.
    ...

    Linus Torvalds
     
  • * 'stable/xen.pm.bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen: use freeze/restore/thaw PM events for suspend/resume/chkpt
    xen: xenbus PM events support

    Linus Torvalds
     
  • …it.kernel.org/pub/scm/linux/kernel/git/konrad/xen

    * 'stable/irq.fairness' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen: events: Remove redundant clear of l2i at end of round-robin loop
    xen: events: Make round-robin scan fairer by snapshotting each l2 word once only
    xen: events: Clean up round-robin evtchn scan.
    xen: events: Make last processed event channel a per-cpu variable.
    xen: events: Process event channels notifications in round-robin order.

    * 'stable/irq.ween_of_nr_irqs' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen: events: Fix compile error if CONFIG_SMP is not defined.
    xen: events: correct locking in xen_irq_from_pirq
    xen: events: propagate irq allocation failure instead of panicking
    xen: events: do not workaround too-small nr_irqs
    xen: events: remove use of nr_irqs as upper bound on number of pirqs
    xen: events: dynamically allocate irq info structures
    xen: events: maintain a list of Xen interrupts
    xen: events: push setup of irq<->{evtchn,ipi,virq,pirq} maps into irq_info init functions
    xen: events: turn irq_info constructors into initialiser functions
    xen: events: use per-cpu variable for cpu_evtchn_mask
    xen: events: refactor GSI pirq bindings functions
    xen: events: rename restore_cpu_pirqs -> restore_pirqs
    xen: events: remove unused public functions
    xen: events: fix xen_map_pirq_gsi error return
    xen: events: simplify comment
    xen: events: separate two unrelated halves of if condition

    Fix up trivial conflicts in drivers/xen/events.c

    Linus Torvalds
     
  • …f git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

    * 'stable/hvc-console' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/hvc: Disable probe_irq_on/off from poking the hvc-console IRQ line.

    * 'stable/gntalloc.v6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen: gntdev: fix build warning
    xen/p2m/m2p/gnttab: do not add failed grant maps to m2p override
    xen-gntdev: Add cast to pointer
    xen-gntdev: Fix incorrect use of zero handle
    xen: change xen/[gntdev/gntalloc] to default m
    xen-gntdev: prevent using UNMAP_NOTIFY_CLEAR_BYTE on read-only mappings
    xen-gntdev: Avoid double-mapping memory
    xen-gntdev: Avoid unmapping ranges twice
    xen-gntdev: Use map->vma for checking map validity
    xen-gntdev: Fix unmap notify on PV domains
    xen-gntdev: Fix memory leak when mmap fails
    xen/gntalloc,gntdev: Add unmap notify ioctl
    xen-gntalloc: Userspace grant allocation driver
    xen-gntdev: Support mapping in HVM domains
    xen-gntdev: Add reference counting to maps
    xen-gntdev: Use find_vma rather than iterating our vma list manually
    xen-gntdev: Change page limit to be global instead of per-open

    * 'stable/balloon' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (24 commits)
    xen-gntdev: Use ballooned pages for grant mappings
    xen-balloon: Add interface to retrieve ballooned pages
    xen-balloon: Move core balloon functionality out of module
    xen/balloon: Remove pr_info's and don't alter retry_count
    xen/balloon: Protect against CPU exhaust by event/x process
    xen/balloon: Migration from mod_timer() to schedule_delayed_work()
    xen/balloon: Removal of driver_pages

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (170 commits)
    [SCSI] scsi_dh_rdac: Add MD36xxf into device list
    [SCSI] scsi_debug: add consecutive medium errors
    [SCSI] libsas: fix ata list corruption issue
    [SCSI] hpsa: export resettable host attribute
    [SCSI] hpsa: move device attributes to avoid forward declarations
    [SCSI] scsi_debug: Logical Block Provisioning (SBC3r26)
    [SCSI] sd: Logical Block Provisioning update
    [SCSI] Include protection operation in SCSI command trace
    [SCSI] hpsa: fix incorrect PCI IDs and add two new ones (2nd try)
    [SCSI] target: Fix volume size misreporting for volumes > 2TB
    [SCSI] bnx2fc: Broadcom FCoE offload driver
    [SCSI] fcoe: fix broken fcoe interface reset
    [SCSI] fcoe: precedence bug in fcoe_filter_frames()
    [SCSI] libfcoe: Remove stale fcoe-netdev entries
    [SCSI] libfcoe: Move FCOE_MTU definition from fcoe.h to libfcoe.h
    [SCSI] libfc: introduce __fc_fill_fc_hdr that accepts fc_hdr as an argument
    [SCSI] fcoe, libfc: initialize EM anchors list and then update npiv EMs
    [SCSI] Revert "[SCSI] libfc: fix exchange being deleted when the abort itself is timed out"
    [SCSI] libfc: Fixing a memory leak when destroying an interface
    [SCSI] megaraid_sas: Version and Changelog update
    ...

    Fix up trivial conflicts due to whitespace differences in
    drivers/scsi/libsas/{sas_ata.c,sas_scsi_host.c}

    Linus Torvalds
     
  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
    [CPUFREQ] pcc-cpufreq: remove duplicate statements
    [CPUFREQ] Remove the pm_message_t argument from driver suspend
    [CPUFREQ] Remove unneeded locks
    [CPUFREQ] Remove old, deprecated per cpu ondemand/conservative sysfs files
    [CPUFREQ] Remove deprecated sysfs file sampling_rate_max
    [CPUFREQ] powernow-k8: The table index is not worth displaying
    [CPUFREQ] calculate delay after dbs_check_cpu
    [CPUFREQ] Add documentation for sampling_down_factor
    [CPUFREQ] drivers/cpufreq: Remove unnecessary semicolons

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: (38 commits)
    amd64_edac: Fix decode_syndrome types
    amd64_edac: Fix DCT argument type
    amd64_edac: Fix ranges signedness
    amd64_edac: Drop local variable
    amd64_edac: Fix PCI config addressing types
    amd64_edac: Fix DRAM base macros
    amd64_edac: Fix node id signedness
    amd64_edac: Drop redundant declarations
    amd64_edac: Enable driver on F15h
    amd64_edac: Adjust ECC symbol size to F15h
    amd64_edac: Simplify scrubrate setting
    PCI: Rename CPU PCI id define
    amd64_edac: Improve DRAM address mapping
    amd64_edac: Sanitize ->read_dram_ctl_register
    amd64_edac: Adjust sys_addr to chip select conversion routine to F15h
    amd64_edac: Beef up early exit reporting
    amd64_edac: Revamp online spare handling
    amd64_edac: Fix channel interleave removal
    amd64_edac: Correct node interleaving removal
    amd64_edac: Add support for interleaved region swapping
    ...

    Fix up trivial conflict in include/linux/pci_ids.h due to
    AMD_15H_NB_MISC being renamed as AMD_15H_NB_F3 next to the new
    AMD_15H_NB_LINK entry.

    Linus Torvalds
     
  • * 'for-linus/2639/i2c-1' of git://git.fluff.org/bjdooks/linux:
    i2c-mpc: Add support for 64bit system
    i2c: add driver for Freescale i.MX28
    i2c: tegra: Add i2c support

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
    watchdog: booke_wdt: clean up status messages
    watchdog: cleanup spaces before tabs
    watchdog: convert to DEFINE_PCI_DEVICE_TABLE
    watchdog: Xen watchdog driver
    watchdog: Intel SCU Watchdog Timer Driver for Moorestown and Medfield platforms.
    watchdog: jz4740_wdt - fix magic character checking
    watchdog: add JZ4740 watchdog driver
    watchdog: it87_wdt: Add support for IT8721F watchdog
    watchdog: hpwdt: build hpwdt as module by default with NMI_DECODING enabled
    watchdog: hpwdt: Fix a couple of typos

    Linus Torvalds
     
  • * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: (44 commits)
    hwmon: (lineage-pem): Fix in1 voltage alarm sysfs attributes
    hwmon/f71882fg: Add support for f71808e
    hwmon/f71882fg: Add support for f71869f and f71869e
    hwmon/f71882fg: Add support for f71889ed
    hwmon/f71882fg: Break out test for auto pwm's controlled by digital readings
    hwmon/f71882fg: Separate temp beep sysfs attr from the other temp sysfs attr
    hwmon/f71882fg: Remove bogus temp2_type for certain models
    hwmon/f71882fg: Make number of temps configurable
    hwmon/f71882fg: Make creation of in sysfs attributes more generic
    hwmon/f71882fg: Only allow negative auto point temps if fan_neg_temp is enabled
    hwmon/f71882fg: Fix temp1 sensor type reporting
    hwmon: (w83627ehf) Display correct temperature sensor labels for systems with NCT6775F
    hwmon: (w83627ehf) Add fan debounce support for NCT6775F and NCT6776F
    hwmon: (w83627ehf) Update Kconfig for W83677HG-B, NCT6775F and NCT6776F
    hwmon: (w83627ehf) Store rpm instead of raw fan speed data
    hwmon: (w83627ehf) Use 16 bit fan count registers if supported
    hwmon: (w83627ehf) Add support for Nuvoton NCT6775F and NCT6776F
    hwmon: (w83627ehf) Permit enabling SmartFan IV mode if configured at startup
    hwmon: (w83627ehf) Convert register arrays to 16 bit, and convert access to pointers
    hwmon: (w83627ehf) Remove references to datasheets which no longer exist
    ...

    Linus Torvalds
     
  • Use __ffs() to find the pending interrupt source instead of looping 32
    times.

    Signed-off-by: Thomas Gleixner
    Cc: Feng Tang
    Cc: Alek Du
    Cc: Alan Cox
    Signed-off-by: Grant Likely

    Thomas Gleixner