1. 08 Mar, 2010 29 commits
  2. 07 Mar, 2010 11 commits
    • Linus Torvalds's avatar
      Merge branch 'x86-mrst-for-linus' of... · 322aafa6
      Linus Torvalds authored
      Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      * 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)
        x86, mrst: Fix whitespace breakage in apb_timer.c
        x86, mrst: Fix APB timer per cpu clockevent
        x86, mrst: Remove X86_MRST dependency on PCI_IOAPIC
        x86, olpc: Use pci subarch init for OLPC
        x86, pci: Add arch_init to x86_init abstraction
        x86, mrst: Add Kconfig dependencies for Moorestown
        x86, pci: Exclude Moorestown PCI code if CONFIG_X86_MRST=n
        x86, numaq: Make CONFIG_X86_NUMAQ depend on CONFIG_PCI
        x86, pci: Add sanity check for PCI fixed bar probing
        x86, legacy_irq: Remove duplicate vector assigment
        x86, legacy_irq: Remove left over nr_legacy_irqs
        x86, mrst: Platform clock setup code
        x86, apbt: Moorestown APB system timer driver
        x86, mrst: Add vrtc platform data setup code
        x86, mrst: Add platform timer info parsing code
        x86, mrst: Fill in PCI functions in x86_init layer
        x86, mrst: Add dummy legacy pic to platform setup
        x86/PCI: Moorestown PCI support
        x86, ioapic: Add dummy ioapic functions
        x86, ioapic: Early enable ioapic for timer irq
      Fixed up semantic conflict of new clocksources due to commit
      17622339 ("clocksource: add argument to resume callback").
    • Linus Torvalds's avatar
      Merge branch 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux · dd04265b
      Linus Torvalds authored
      * 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux:
        i2c: Add support for Xilinx XPS IIC Bus Interface
        i2c: omap: Add support for 16-bit registers
        i2c-pnx: fix setting start/stop condition
        powerpc: doc/dts-bindings: update doc of FSL I2C bindings
        i2c-mpc: add support for the MPC512x processors from Freescale
        i2c-mpc: rename "setclock" initialization functions to "setup"
        i2c-mpc: use __devinit[data] for initialization functions and data
        i2c/imx: don't add probe function to the driver struct
        i2c: Add support for Ux500/Nomadik I2C controller
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 · 6dc3eb5c
      Linus Torvalds authored
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (66 commits)
        mfd: Fix ucb1x00 build failure for collie_defconfig
        mfd: Fix lpc_sch related depends/selects, fix build error
        gpio: Fix sch_gpio warning
        gpio: add Intel SCH GPIO controller driver
        i2c: convert i2c-isch to platform_device
        mfd: Use completion interrupt for WM831x AUXADC
        mfd: Use completion interrupt for WM835x AUXADC
        mfd: Introduce remove_script function for twl4030
        mfd/mmc: SDHI Kconfig update
        mfd: sh_mobile_sdhi MMC_CAP_MMC_HIGHSPEED support
        gpiolib: Force wm831x GPIOs into GPIO mode when requested
        mfd: Add WM831x revision B support
        gpiolib: Correct debugfs display of WM831x GPIO inversion
        gpiolib: Actually set output state in wm831x_gpio_direction_output()
        tmio_mmc: Balance cell enable()/disable() calls
        tmio_mmc: Remove const from platform data V3
        tmio_mmc: Use 100ms mmc_detect_change() delay
        tmio_mmc: Add MMC_CAP_MMC_HIGHSPEED support V2
        tmio_mmc: Keep card-detect interrupts enabled
        mfd: Add twl6030 base addr for ID0, ID1, ID2
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 8fe900b8
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (368 commits)
        Staging: winbond: fix up wireless api errors
        Staging: dream: camera: sk5k3e2fx: fix code style issues
        Staging: dream: camera: msm_camera: fix code style issues
        Staging: wlan-ng: More checkpatch.pl error cleanups
        Staging: wlan-ng - checkpatch.pl fixups
        Staging: comedi: comedi_fops.c: Checkpatch cleanup
        Staging: comedi: fix suspect code indent in ni_labpc.c
        Staging: comedi: fix yet another brace coding style issue in ni_labpc.c
        Staging: comedi: fix another brace coding style issues in ni_labpc.c
        Staging: comedi: fix brace coding style issue in ni_labpc.c
        Staging: comedi: poc: Adding some KERN_ facility level
        Staging: dream: camera: msm_camera: fix some code style issues
        Staging: wlan-ng: fix most of the style issues in hfa384x.h
        Staging: dream: camera: msm_camera: fix coding style issues
        Staging: comedi: fix bracing coding style and 80 character issues in ni_660x.c
        Staging: comedi: fix bracing coding style issue in ni_65xx.c
        Staging: comedi: pcmad: Checkpatch cleanups
        Staging: comedi: poc: fix coding style issues
        staging: dt3155: revert u_long to u64 usage
        Staging: comedi: drivers.c: Checkpatch cleanup
    • Randy Dunlap's avatar
      seq_file: fix new kernel-doc warnings · 138860b9
      Randy Dunlap authored
      Fix kernel-doc notation in new seq-file functions and
      correct spelling.
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Cc: Li Zefan <lizf@cn.fujitsu.com>
      Cc: Alexander Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 4a31c08d
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (26 commits)
        sh: Convert sh to use read/update_persistent_clock
        sh: Move PMB debugfs entry initialization to later stage
        sh: Fix up flush_cache_vmap() on SMP.
        sh: fix up MMU reset with variable PMB mapping sizes.
        sh: establish PMB mappings for NUMA nodes.
        sh: check for existing mappings for bolted PMB entries.
        sh: fixed virt/phys mapping helpers for PMB.
        sh: make pmb iomapping configurable.
        sh: reworked dynamic PMB mapping.
        sh: Fix up cpumask_of_pcibus() for the NUMA build.
        serial: sh-sci: Tidy up build warnings.
        sh: Fix up ctrl_read/write stragglers in migor setup.
        serial: sh-sci: Add DMA support.
        dmaengine: shdma: extend .device_terminate_all() to record partial transfer
        sh: merge sh7722 and sh7724 DMA register definitions
        sh: activate runtime PM for dmaengine on sh7722 and sh7724
        dmaengine: shdma: add runtime PM support.
        dmaengine: shdma: separate DMA headers.
        dmaengine: shdma: convert to platform device resources
        dmaengine: shdma: fix DMA error handling.
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 · 2ddb3b15
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
        parisc: use __ratelimit in unaligned.c
        parisc: Convert to read/update_persistent_clock
        parisc: Simplify param.h by including <asm-generic/param.h>
        parisc: drop unnecessary cast in __ldcw_align() macro
        parisc: add strict copy size checks (v2)
        parisc: remove trailing space in messages
        parisc: ditto sys_accept4
        parisc: wire up sys_recvmmsg
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · 5980bb3e
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
        PM: Provide generic subsystem-level callbacks
        PM / Runtime: Document power.runtime_auto and related functions
    • Linus Torvalds's avatar
    • Ben Dooks's avatar
      Merge branch 'next-i2c-xilinx' into next-i2c · 3f4ae860
      Ben Dooks authored
    • Ben Dooks's avatar
      Merge branch 'next-i2c-omap' into next-i2c · 2086f848
      Ben Dooks authored