commit 9e79e3e9dd9672b37ac9412e9a926714306551fe
Merge: ebde8b0 1a8e0da
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Aug 30 11:28:18 2011 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
      sparc64: Only Panther cheetah+ chips have POPC.

commit ebde8b0223020b0cdd18c284ab5c0bb67ebc787e
Merge: bd82382 302a8e8
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Aug 30 10:34:24 2011 -0700

    Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/radeon/kms: add s/r quirk for Compaq Presario V5245EU
      drm/radeon/kms: evergreen & ni reset SPI block on CP resume
      drm: Fix the number of connector and encoder to cleanup functions

commit bd823821e68e5de6d680cbbf1c8654c9c36674e1
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date:   Tue Aug 30 15:17:03 2011 +0200

    bitops: Move find_next_bit.o from lib-y to obj-y
    
    If there are no builtin users of find_next_bit_le() and
    find_next_zero_bit_le(), these functions are not present in the kernel
    image, causing m68k allmodconfig to fail with:
    
      ERROR: "find_next_zero_bit_le" [fs/ufs/ufs.ko] undefined!
      ERROR: "find_next_bit_le" [fs/udf/udf.ko] undefined!
      ...
    
    This started to happen after commit 171d809df189 ("m68k: merge mmu and
    non-mmu bitops.h"), as m68k had its own inline versions before.
    
    commit 63e424c84429 ("arch: remove CONFIG_GENERIC_FIND_{NEXT_BIT,
    BIT_LE, LAST_BIT}") added find_last_bit.o to obj-y (so it's always
    included), but find_next_bit.o to lib-y (so it gets removed by the
    linker if there are no builtin users).
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Cc: Akinobu Mita <akinobu.mita@gmail.com>
    Cc: Greg Ungerer <gerg@uclinux.org>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 302a8e8b06d312dcb3b718dfeb42aa912b5f426b
Author: Alex Deucher <alexander.deucher@amd.com>
Date:   Mon Aug 29 14:55:25 2011 +0000

    drm/radeon/kms: add s/r quirk for Compaq Presario V5245EU
    
    Fixes resume on Compaq Presario V5245EU.
    
    Fixes:
    https://bugzilla.kernel.org/show_bug.cgi?id=41642
    
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit a49a50dad48586d42ebac1a6730c3a3cd5603421
Author: Jerome Glisse <jglisse@redhat.com>
Date:   Wed Aug 24 20:00:17 2011 +0000

    drm/radeon/kms: evergreen & ni reset SPI block on CP resume
    
    For some reason SPI block is in broken state after module
    unloading. This lead to broken rendering after reloading
    module. Fix this by reseting SPI block in CP resume function
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com
    Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 1a8e0da5937a6c87807083baa318cf8f98dac9aa
Author: David S. Miller <davem@davemloft.net>
Date:   Mon Aug 29 21:14:29 2011 -0700

    sparc64: Only Panther cheetah+ chips have POPC.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 90e93648c41bd29a72f6ec55ce27a23c209eab8c
Merge: 3ae627b 2590415
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Aug 29 16:34:07 2011 -0700

    Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
    
    * 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
      ARM: pm: avoid writing the auxillary control register for ARMv7
      ARM: pm: some ARMv7 requires a dsb in resume to ensure correctness
      ARM: pm: arm920/926: fix number of registers saved
      ARM: pm: CPU specific code should not overwrite r1 (v:p offset)
      ARM: 7066/1: proc-v7: disable SCTLR.TE when disabling MMU
      ARM: 7065/1: kexec: ensure new kernel is entered in ARM state
      ARM: 7003/1: vexpress: Add clock definition for the SP805.
      ARM: 7051/1: cpuimx* boards: fix mach-types errors
      ARM: 7019/1: Footbridge: select CLKEVT_I8253 for ARCH_NETWINDER
      ARM: 7015/1: ARM errata: Possible cache data corruption with hit-under-miss enabled
      ARM: 7014/1: cache-l2x0: Fix L2 Cache size calculation.
      ARM: 6967/1: ep93xx: ts72xx: fix board model detection
      ARM: 6965/1: ep93xx: add model detection for ts-7300 and ts-7400 boards
      ARM: cache: detect VIPT aliasing I-cache on ARMv6
      ARM: twd: register clockevents device before enabling PPI
      ARM: realview: ensure visibility of writes during reset
      ARM: perf: make name of arm_pmu_type consistent
      ARM: perf: fix prototype of release_pmu
      ARM: fix perf build with uclibc toolchains

commit 3ae627b5a6c8f6bf992eee6a3399a1854641a476
Merge: d4d7b2a 039920c
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Aug 29 16:33:32 2011 -0700

    Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
      ARM: mach-footbridge: add missing header file <video/vga.h>
      ARM: mach-orion5x: add missing header file <linux/vga.h>
      arm: fix compile failure in orion5x/dns323-setup.c
      at91: at91sam9261.c: fix typo in t2_clk alias for atmel_tcb.0
      ARM: S5P: fix bug in spdif_clk_get_rate
      ARM: EXYNOS4: Add restart hook for proper reboot
      ARM: EXYNOS4: Increase reset delay for USB HOST PHY
      ARM: S5P: add required chained_irq_enter/exit to gpio-int code
      ARM: EXYNOS4: add required chained_irq_enter/exit to eint code
      ARM: SAMSUNG: Add chained enrty/exit call to timer interrupt handler
      ARM: S3C64XX: Fix build break in PM debug
      ARM: S5PV210: Fix build warning
      ARM: EXYNOS4: Fix the IRQ definitions for MIPI CSIS device
      ARM: EXYNOS4: remove duplicated inclusion
      ARM: EXYNOS4: Fix wrong devname to support clkdev
      ARM: EXYNOS4: Use the correct regulator names on universal_c210
      ARM: SAMSUNG: Fix Section mismatch in samsung_bl_set()
      ARM: S5P64X0: Replace irq_gc_ack() with irq_gc_ack_set_bit()

commit d4d7b2a11c423a8d4088bb0090e4c8d626d043bc
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date:   Mon Aug 29 10:38:57 2011 +1000

    remove remaining references to nfsservctl
    
    These were missed in commit f5b940997397 "All Arch: remove linkage
    for sys_nfsservctl system call" due to them having no sys_ prefix
    (presumably).
    
    Cc: NeilBrown <neilb@suse.de>
    Cc: linuxppc-dev@lists.ozlabs.org
    Cc: linux-parisc@vger.kernel.org
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Acked-by: James Bottomley <James.Bottomley@hansenpartnership.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 0f43dd546d991ca260d8a72d07f617907c508de8
Merge: 2cd6c7f e9278a4
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Aug 29 13:38:29 2011 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (42 commits)
      netpoll: fix incorrect access to skb data in __netpoll_rx
      cassini: init before use in cas_interruptN.
      can: ti_hecc: Fix uninitialized spinlock in probe
      can: ti_hecc: Fix unintialized variable
      net: sh_eth: fix the compile error
      net/phy: fix DP83865 phy interrupt handler
      sendmmsg/sendmsg: fix unsafe user pointer access
      ibmveth: Fix leak when recycling skb and hypervisor returns error
      arp: fix rcu lockdep splat in arp_process()
      bridge: fix a possible use after free
      bridge: Pseudo-header required for the checksum of ICMPv6
      mcast: Fix source address selection for multicast listener report
      MAINTAINERS: Update GIT trees for network development
      ath9k: Fix PS wrappers in ath9k_set_coverage_class
      carl9170: Fix mismatch in carl9170_op_set_key mutex lock-unlock
      wl12xx: add max_sched_scan_ssids value to the hw description
      wl12xx: Fix validation of pm_runtime_get_sync return value
      wl12xx: Remove obsolete testmode NVS push command
      bcma: add uevent to the bus, to autoload drivers
      ath9k_hw: Fix STA (AR9485) bringup issue due to incorrect MAC address
      ...

commit 2cd6c7f7f1e3a116506bb3326f0d23a6b801638a
Merge: 380dc20 38f7f8f
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Aug 29 13:37:42 2011 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
      sparc32,sun4d: Change IPI IRQ level to prevent collision between IPI and timer interrupt
      sparc: Remove another reference to nfsservctl

commit 380dc2008824473450b0c6596dcd429965a4a9da
Merge: c42a263 a408bae
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Aug 29 13:37:17 2011 -0700

    Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x
    
    * 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x:
      ARM: mach-shmobile: sh7372 CMT3 and CMT4 clock support
      ARM: mach-shmobile: sh7372 MSIOF clock support
      ARM: mach-shmobile: clock-sh7372: fixup USB-DMAC1 settings
      ARM: mach-shmobile: clock-sh73a0: tidyup CKSCR main clock selecter
      ARM: mach-shmobile: Remove 3DG/SGX from sh7372 INTCS
      ARM: mach-shmobile: mackerel: Add USB-DMA ID
      mmc: sdhi, mmcif: zboot: Correct clock disable logic
      ARM: mach-shmobile: ag5evm: SDHI requires waiting for idle
      ARM: static should be at beginning of declaration
      ARM: mach-shmobile: Use CMT2 for timer on sh7372
      ARM: mach-shmobile: sh7372: Add USB-DMAC support

commit c42a2634d8495a764e918a8c4252c100ef23b369
Merge: f9557a4 21d41f2
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Aug 29 13:34:48 2011 -0700

    Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x
    
    * 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x:
      sh: fix the compile error in setup-sh7757.c
      serial: sh-sci: report CTS as active for get_mctrl
      sh: Add unaligned memory access for PC relative intructions
      sh: Fix unaligned memory access for branches without delay slots
      sh: Fix up fallout from cpuidle changes.
      serial: sh-sci: console Runtime PM support
      sh: Fix conflicting definitions of ptrace_triggered
      serial: sh-sci: fix DMA build by including dma-mapping.h
      serial: sh-sci: Fix up default regtype probing.
      sh: intc: enable both edges GPIO interrupts on sh7372
      shwdt: fix usage of mod_timer
      clocksource: sh_cmt: wait for CMCNT on init V2

commit f9557a4477140d2aa6845d310edbdeff735c80e1
Author: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Date:   Sat Aug 27 19:32:34 2011 +0000

    MAINTAINERS: change framebuffer maintainer
    
    As Paul has not much time for it I take over maintaining the
    framebuffer subsystem.
    
    Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
    Acked-by: Paul Mundt <lethal@linux-sh.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 38f7f8f05e8239e9871f7e1c4b0a842080e85315
Author: Kjetil Oftedal <oftedal@gmail.com>
Date:   Mon Aug 29 00:16:28 2011 +0200

    sparc32,sun4d: Change IPI IRQ level to prevent collision between IPI and timer interrupt
    
    On Sun4d systems running in SMP mode, IRQ 14 is used for timer interrupts
    and has a specialized interrupt handler. IPI is currently set to use IRQ 14
    as well, which causes it to trigger the timer interrupt handler, and not the
    IPI interrupt handler.
    
    The IPI interrupt is therefore changed to IRQ 13, which is the highest
    normally handled interrupt. This IRQ is also used for SBUS interrupts,
    however there is nothing in the IPI/SBUS interrupt handlers that indicate
    that they will not handle sharing the interrupt.
    (IRQ 13 is indicated as audio interrupt, which is unlikely to be found in a
    sun4d system)
    
    Signed-off-by: Kjetil Oftedal <oftedal@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 2ee04a10697a642ee3b53f0019d3dac7b79f9aae
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date:   Mon Aug 29 15:43:40 2011 +1000

    sparc: Remove another reference to nfsservctl
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 6380c509215b10c44aec8760e65b2e7f1827d009
Author: Joonyoung Shim <jy0922.shim@samsung.com>
Date:   Sat Aug 27 02:06:21 2011 +0000

    drm: Fix the number of connector and encoder to cleanup functions
    
    It is left out the code to decrease the number of connector and encoder
    to the cleanup functions.
    
    Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit a408baea3cdd2a7b5ad3d70080dff454b8883f62
Author: Magnus Damm <damm@opensource.se>
Date:   Fri Aug 26 05:28:42 2011 +0000

    ARM: mach-shmobile: sh7372 CMT3 and CMT4 clock support
    
    Add clock control support for sh7372 CMT hardware blocks.
    
    No upstream sh7372 boards are making use of CMT3 + CMT4,
    but the sh7372 hardware happens to come out of reset with
    all CMT MSTP clocks _enabled_, so to save power we need
    to implement a fix in software to shut down unused clocks.
    
    This patch relies on the recently merged
    
     794d78f drivers: sh: late disabling of clocks V2
    
    to make sure the unused clocks get disabled as expected.
    
    Signed-off-by: Magnus Damm <damm@opensource.se>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 7ceb6666f03bc691e692c8d14ea2a8f3fa879ec8
Author: Magnus Damm <damm@opensource.se>
Date:   Fri Aug 26 05:25:11 2011 +0000

    ARM: mach-shmobile: sh7372 MSIOF clock support
    
    Add clock control support for sh7372 MSIOF hardware blocks.
    
    No upstream sh7372 boards are making use of MSIOF0->2,
    but the sh7372 hardware happens to come out of reset with
    all MSIOF MSTP clocks _enabled_, so to save power we need
    to implement a fix in software to shut down unused clocks.
    
    This patch relies on the recently merged
    
     794d78f drivers: sh: late disabling of clocks V2
    
    to make sure the unused clocks get disabled as expected.
    
    Signed-off-by: Magnus Damm <damm@opensource.se>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 6b4cb8ffe8251a60cae6678959b9dec47337b8de
Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date:   Thu Aug 25 03:47:42 2011 +0000

    ARM: mach-shmobile: clock-sh7372: fixup USB-DMAC1 settings
    
    USB-DMAC1 needs SMSTPCR4/MSTP407 controls, not MSTP214
    this patch tested on mackerel board
    
    Reported-by: Magnus Damm <damm@opensource.se>
    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 86d84083cfb15dd9594eefff7859e982770930d0
Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date:   Fri Aug 26 07:27:45 2011 +0000

    ARM: mach-shmobile: clock-sh73a0: tidyup CKSCR main clock selecter
    
    MAINCKSEL is [29:28], not [27:24]
    
    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 4861da4feebe548a749c7f52c89a325839c3d281
Author: Magnus Damm <damm@opensource.se>
Date:   Wed Aug 10 05:45:30 2011 +0000

    ARM: mach-shmobile: Remove 3DG/SGX from sh7372 INTCS
    
    This patch removes support for the SGX interrupt source in
    the sh7372 INTCS controller.
    
    The SGX hardware block included in sh7372 is already hooked
    up to the ARM Cortex-A8 core using the INTCA controller,
    so SGX users are encouraged to make use of that interrupt
    source instead.
    
    Removing support for the SGX interrupt source in INTCS
    simplifies the sh7372 power management code by allowing
    us to assume that only INTCA needs to be powered on to
    operate the SGX hardware.
    
    If the INTCS interrupt source would be kept then the kernel
    would be forced to deal with additional dependencies that does
    not follow the regular power domain hiearachy. With this
    patch in place we can safely power down INTCS while the
    SGX is operating.
    
    Signed-off-by: Magnus Damm <damm@opensource.se>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 8a1c049aa9d31710dac5a794b47be5a081a886e4
Merge: fe43756 afe4804
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Mon Aug 29 16:10:24 2011 +0900

    Merge branch 'rmobile/dma' into rmobile-fixes-for-linus

commit 21d41f2b312231536cf981c960c83cc4493c0293
Author: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Date:   Tue Aug 23 09:15:46 2011 +0000

    sh: fix the compile error in setup-sh7757.c
    
    Fix the following build errors:
    
      CC      arch/sh/kernel/cpu/sh4a/setup-sh7757.o
    arch/sh/kernel/cpu/sh4a/setup-sh7757.c:681: error: implicit declaration of function ‘DMA_BIT_MASK’
    arch/sh/kernel/cpu/sh4a/setup-sh7757.c:681: error: initializer element is not constant
    arch/sh/kernel/cpu/sh4a/setup-sh7757.c:681: error: (near initialization for ‘usb_ehci_device.dev.coherent_dma_mask’)
    arch/sh/kernel/cpu/sh4a/setup-sh7757.c:705: error: initializer element is not constant
    arch/sh/kernel/cpu/sh4a/setup-sh7757.c:705: error: (near initialization for ‘usb_ohci_device.dev.coherent_dma_mask’)
    make[3]: *** [arch/sh/kernel/cpu/sh4a/setup-sh7757.o] Error 1
    
    Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 4480a688b2beaa82ecac269b6e21bf1a26251bf9
Author: Yoshii Takashi <takashi.yoshii.zj@renesas.com>
Date:   Tue Aug 23 08:27:18 2011 +0000

    serial: sh-sci: report CTS as active for get_mctrl
    
    sh-sci.c sets hardware up and then let the HW do all flow controls.
    There is no software code, nor needs to get/set real CTS signal.
    
    But, when turning CRTSCTS on through termios, uart_set_termios() in
    serial_core.c checks CTS, and stops TX if it is inactive at the moment.
    
    Because sci_get_mctrl() returns a fixed value DTR|RTS|DSR but CTS,
    the sequence
      open -> set CRTSCTS -> write
    hit the case and stop working, no more outputs.
    
    This patch makes sci_get_mctrl() report CTS in addition.
    
    Signed-off-by: Takashi YOSHII <takashi.yoshii.zj@renesas.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 34f7145a63211eb7ecfcafa6c2a8db5646baf953
Author: Phil Edworthy <Phil.Edworthy@renesas.com>
Date:   Wed Aug 24 10:43:59 2011 +0000

    sh: Add unaligned memory access for PC relative intructions
    
    This adds unaligned memory access support for the following instructions:
      mov.w @(disp,PC),Rn
      mov.l @(disp,PC),Rn
    
    These instructions are often used on SH2A toolchains.
    
    Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 0710b91c516ffd448db6e80e9026f11778a80d45
Author: Phil Edworthy <Phil.Edworthy@renesas.com>
Date:   Mon Aug 22 15:56:08 2011 +0000

    sh: Fix unaligned memory access for branches without delay slots
    
    This patch just clears the return code for those cases where an
    unaligned memory access occurs on branch instructions without a
    delay slot.
    
    Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 25904157168ddc8841748a729914f00e53d7e049
Author: Russell King <rmk+kernel@arm.linux.org.uk>
Date:   Fri Aug 26 22:44:59 2011 +0100

    ARM: pm: avoid writing the auxillary control register for ARMv7
    
    For ARMv7 kernels running in the non-secure world, writing to the
    auxillary control register causes an abort, so we must avoid directly
    writing the auxillary control register.  If the ACR has already been
    reinitialized by SoC code, don't try to restore it.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit f35235a315a167e38e8e5bc9e476dcd7c932612c
Author: Russell King <rmk+kernel@arm.linux.org.uk>
Date:   Sat Aug 27 00:37:38 2011 +0100

    ARM: pm: some ARMv7 requires a dsb in resume to ensure correctness
    
    Add a dsb after the isb to ensure that the previous writes to the
    CP15 registers take effect before we enable the MMU.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 1c0270cd3a7a66148c3f72cab8fffc650d196d1d
Author: Russell King <rmk+kernel@arm.linux.org.uk>
Date:   Sat Aug 27 11:43:14 2011 +0100

    ARM: pm: arm920/926: fix number of registers saved
    
    ARM920 and ARM926 save four registers, not three.  Fix the size of
    the suspend region required.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 6f354e5f40f433da98fab4103cd3a0aef1c18bde
Author: Russell King <rmk+kernel@arm.linux.org.uk>
Date:   Sat Aug 27 11:37:58 2011 +0100

    ARM: pm: CPU specific code should not overwrite r1 (v:p offset)
    
    r1 stores the v:p offset from the CPU invariant resume code, and is
    expected to be preserved by the CPU specific code.  Overwriting it is
    not a good idea.
    
    We've managed to get away with it on sa1100 platforms because most
    happen to have PHYS_OFFSET == PAGE_OFFSET, but that may not be the
    case depending on kernel configuration.  So fix this latent bug.
    
    This fixes xsc3 as well which was saving and restoring this register
    independently.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 0f81bb6b051ad760686b5b0fef8c731282c16ef5
Author: Will Deacon <will.deacon@arm.com>
Date:   Fri Aug 26 16:34:51 2011 +0100

    ARM: 7066/1: proc-v7: disable SCTLR.TE when disabling MMU
    
    cpu_v7_reset disables the MMU and then branches to the provided address.
    On Thumb-2 kernels, we should take care to clear the Thumb Exception
    enable bit in the System Control Register, otherwise this may wreak
    havok in the code to which we are branching (for example, an ARM kernel
    image via kexec).
    
    Reviewed-by: Dave Martin <dave.martin@linaro.org>
    Signed-off-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 552e0c8da8ff7099e6fe060cd7ec36ae11f5465b
Author: Will Deacon <will.deacon@arm.com>
Date:   Fri Aug 26 16:32:57 2011 +0100

    ARM: 7065/1: kexec: ensure new kernel is entered in ARM state
    
    Commit 540b5738 ("ARM: 6999/1: head, zImage: Always Enter the kernel in
    ARM state") mandates that the kernel should be entered in ARM state.
    
    If a Thumb-2 kernel kexecs a new kernel image, we need to ensure that
    we change state when branching to the new code. This patch replaces a
    mov pc, lr with a bx lr on Thumb-2 kernels so that we transition to ARM
    state if need be.
    
    Reviewed-by: Dave Martin <dave.martin@linaro.org>
    Signed-off-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit e9278a475f845833b569ca47171e64fe48c616e0
Author: Eric Dumazet <eric.dumazet@gmail.com>
Date:   Fri Aug 26 06:26:15 2011 +0000

    netpoll: fix incorrect access to skb data in __netpoll_rx
    
    __netpoll_rx() doesnt properly handle skbs with small header
    
    pskb_may_pull() or pskb_trim_rcsum() can change skb->data, we must
    reload it.
    
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 3d015565f316584139946a1c450d44209beefeb6
Author: françois romieu <romieu@fr.zoreil.com>
Date:   Thu Aug 25 05:02:49 2011 +0000

    cassini: init before use in cas_interruptN.
    
    Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
    Spotted-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 86ad47fff97a9e416aadedfe68909b2d9143dc42
Author: Abhilash K V <abhilash.kv@ti.com>
Date:   Tue Aug 23 03:05:57 2011 +0000

    can: ti_hecc: Fix uninitialized spinlock in probe
    
    In ti_hecc_probe(), the spinlock  priv->mbx_lock is not
    inited, causing a spinlock lockup BUG.
    
    Acked-by: Anant Gole <anantgole@ti.com>
    Signed-off-by: Abhilash K V <abhilash.kv@ti.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 6f288cc52f478e6f58d96158e7cd857fedb6d111
Author: Abhilash K V <abhilash.kv@ti.com>
Date:   Tue Aug 23 03:05:48 2011 +0000

    can: ti_hecc: Fix unintialized variable
    
    In ti_hecc_xmit(), local variable "data" is not initialized before
    being used.
    This initialization got inadvertently removed in the following patch:
    
    	can: Unify droping of invalid tx skbs and netdev stats
    
    Acked-by: Anant Gole <anantgole@ti.com>
    Signed-off-by: Abhilash K V <abhilash.kv@ti.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 69558eeeaba7d79364bb9ac4743dc1ad209508b7
Author: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Date:   Mon Aug 22 23:26:33 2011 +0000

    net: sh_eth: fix the compile error
    
    Fix the following build error:
    
      CC      drivers/net/sh_eth.o
    drivers/net/sh_eth.c:1115: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘sh_eth_interrupt’
    drivers/net/sh_eth.c: In function ‘sh_eth_open’:
    drivers/net/sh_eth.c:1387: error: implicit declaration of function ‘request_irq’
    drivers/net/sh_eth.c:1387: error: ‘sh_eth_interrupt’ undeclared (first use in this function)
    drivers/net/sh_eth.c:1387: error: (Each undeclared identifier is reported only once
    drivers/net/sh_eth.c:1387: error: for each function it appears in.)
    drivers/net/sh_eth.c:1391: error: ‘IRQF_SHARED’ undeclared (first use in this function)
    drivers/net/sh_eth.c:1424: error: implicit declaration of function ‘free_irq’
    make[2]: *** [drivers/net/sh_eth.o] Error 1
    
    Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 6e6f400f5381e08dc80e1b5a37ed02a081c179d9
Author: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
Date:   Mon Aug 22 21:07:14 2011 +0000

    net/phy: fix DP83865 phy interrupt handler
    
    According to the DP83865 datasheet we need to clear
    the interrupt status bit by writing a 1 to the
    corresponding bit in INT_CLEAR (2:0 are reserved).
    
    Proposed and tested by Thorsten.
    
    Signed-off-by: Thorsten Schubert <tshu@msc-ge.com>
    Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 039920ccdde7b678adcc554cbb39f185080ce2e5
Merge: 966843e c0764b2
Author: Arnd Bergmann <arnd@arndb.de>
Date:   Fri Aug 26 15:34:00 2011 +0000

    Merge branch 'at91/fixes' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into fixes

commit 966843eb43cf90b1c6d3f56ecc96832bf6fb4b8f
Merge: 4a3f423 9fc2071
Author: Arnd Bergmann <arnd@arndb.de>
Date:   Fri Aug 26 15:27:34 2011 +0000

    Merge branch 'fixes' of git://git.jdl.com/software/linux-3.0 into fixes

commit 4a3f4233c56d2e6ce8e432ff9aaaaad5108d7ab8
Merge: fcb8ce5 5d747c6
Author: Arnd Bergmann <arnd@arndb.de>
Date:   Fri Aug 26 15:08:19 2011 +0000

    Merge branch 'samsung/fixes' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into fixes

commit e2e6be56df37c371f564e127c154036b0c2211a1
Merge: bc909d9 8b2a382
Author: John W. Linville <linville@tuxdriver.com>
Date:   Fri Aug 26 10:33:51 2011 -0400

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem

commit 2d0b579a9831c927bcebf5f61055e7462f0af2dc
Merge: e80ca14 671ee7f
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Fri Aug 26 16:49:51 2011 +0900

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-fixes-for-linus

commit 9fc2071a652fa03e78160cbe0a39c8fdddf1eea7
Author: Bryan Wu <bryan.wu@canonical.com>
Date:   Wed Aug 17 18:00:04 2011 +0800

    ARM: mach-footbridge: add missing header file <video/vga.h>
    
    This patch fixes following building error:
    --
    arch/arm/mach-footbridge/dc21285.c: In function 'dc21285_preinit':
    arch/arm/mach-footbridge/dc21285.c:299:2: error: 'vga_base' undeclared (first use in this function)
    arch/arm/mach-footbridge/dc21285.c:299:2: note: each undeclared identifier is reported only once for each function it appears in
    make[1]: *** [arch/arm/mach-footbridge/dc21285.o] Error 1
    --
    
    Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
    Acked-by: Rob Herring <rob.herring@calxeda.com>

commit 158c0c623ab57e4e1cf705ce64b8efddc1cf82dd
Author: Bryan Wu <bryan.wu@canonical.com>
Date:   Wed Aug 17 17:29:38 2011 +0800

    ARM: mach-orion5x: add missing header file <linux/vga.h>
    
    This patch fixed following building error:
    --
    arch/arm/mach-orion5x/pci.c: In function 'orion5x_pci_sys_setup':
    arch/arm/mach-orion5x/pci.c:563:2: error: 'vga_base' undeclared (first use in this function)
    arch/arm/mach-orion5x/pci.c:563:2: note: each undeclared identifier is reported only once for each function it appears in
    make[1]: *** [arch/arm/mach-orion5x/pci.o] Error 1
    make[1]: *** Waiting for unfinished jobs....
    --
    
    Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
    Acked-by: Rob Herring <rob.herring@calxeda.com>

commit 5166793feb688a884832ca656f161f683be8f04c
Author: Paul Gortmaker <paul.gortmaker@windriver.com>
Date:   Mon Aug 1 12:42:14 2011 -0400

    arm: fix compile failure in orion5x/dns323-setup.c
    
    Upstream commit d5341942d784134f2997b3ff82cd63cf71d1f932 "PCI: Make the
    struct pci_dev * argument of pci_fixup_irqs const." leaked an extra
    "const" into an actual call site (vs a proto/decl) which causes this:
    
    arch/arm/mach-orion5x/dns323-setup.c: In function 'dns323_pci_map_irq':
    arch/arm/mach-orion5x/dns323-setup.c:80: error: expected expression before 'const'
    arch/arm/mach-orion5x/dns323-setup.c:80: error: too few arguments to function 'orion5x_pci_map_irq'
    make[3]: *** [arch/arm/mach-orion5x/dns323-setup.o] Error 1
    
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    Acked-by: Nicolas Pitre <nico@fluxnic.net>
    Acked-by: Ralf Baechle <ralf@linux-mips.org>

commit bc909d9ddbf7778371e36a651d6e4194b1cc7d4c
Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date:   Wed Aug 24 19:45:03 2011 -0700

    sendmmsg/sendmsg: fix unsafe user pointer access
    
    Dereferencing a user pointer directly from kernel-space without going
    through the copy_from_user family of functions is a bad idea. Two of
    such usages can be found in the sendmsg code path called from sendmmsg,
    added by
    
    commit c71d8ebe7a4496fb7231151cb70a6baa0cb56f9a upstream.
    commit 5b47b8038f183b44d2d8ff1c7d11a5c1be706b34 in the 3.0-stable tree.
    
    Usages are performed through memcmp() and memcpy() directly. Fix those
    by using the already copied msg_sys structure instead of the __user *msg
    structure. Note that msg_sys can be set to NULL by verify_compat_iovec()
    or verify_iovec(), which requires additional NULL pointer checks.
    
    Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
    Signed-off-by: David Goulet <dgoulet@ev0ke.net>
    CC: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
    CC: Anton Blanchard <anton@samba.org>
    CC: David S. Miller <davem@davemloft.net>
    CC: stable <stable@kernel.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit c6f59d13e24187ff95427a9f4a5a7e14fb8faf5a
Author: Anton Blanchard <anton@samba.org>
Date:   Wed Aug 24 17:56:15 2011 -0700

    ibmveth: Fix leak when recycling skb and hypervisor returns error
    
    If h_add_logical_lan_buffer returns an error we need to free
    the skb.
    
    Signed-off-by: Anton Blanchard <anton@samba.org>
    Cc: stable <stable@kernel.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 20e6074eb8e096b3a595c093d1cb222f378cd671
Author: Eric Dumazet <eric.dumazet@gmail.com>
Date:   Mon Aug 22 19:32:42 2011 +0000

    arp: fix rcu lockdep splat in arp_process()
    
    Dave Jones reported a lockdep splat triggered by an arp_process() call
    from parp_redo().
    
    Commit faa9dcf793be (arp: RCU changes) is the origin of the bug, since
    it assumed arp_process() was called under rcu_read_lock(), which is not
    true in this particular path.
    
    Instead of adding rcu_read_lock() in parp_redo(), I chose to add it in
    neigh_proxy_process() to take care of IPv6 side too.
    
     ===================================================
     [ INFO: suspicious rcu_dereference_check() usage. ]
     ---------------------------------------------------
     include/linux/inetdevice.h:209 invoked rcu_dereference_check() without
    protection!
    
     other info that might help us debug this:
    
     rcu_scheduler_active = 1, debug_locks = 0
     4 locks held by setfiles/2123:
      #0:  (&sb->s_type->i_mutex_key#13){+.+.+.}, at: [<ffffffff8114cbc4>]
    walk_component+0x1ef/0x3e8
      #1:  (&isec->lock){+.+.+.}, at: [<ffffffff81204bca>]
    inode_doinit_with_dentry+0x3f/0x41f
      #2:  (&tbl->proxy_timer){+.-...}, at: [<ffffffff8106a803>]
    run_timer_softirq+0x157/0x372
      #3:  (class){+.-...}, at: [<ffffffff8141f256>] neigh_proxy_process
    +0x36/0x103
    
     stack backtrace:
     Pid: 2123, comm: setfiles Tainted: G        W
    3.1.0-0.rc2.git7.2.fc16.x86_64 #1
     Call Trace:
      <IRQ>  [<ffffffff8108ca23>] lockdep_rcu_dereference+0xa7/0xaf
      [<ffffffff8146a0b7>] __in_dev_get_rcu+0x55/0x5d
      [<ffffffff8146a751>] arp_process+0x25/0x4d7
      [<ffffffff8146ac11>] parp_redo+0xe/0x10
      [<ffffffff8141f2ba>] neigh_proxy_process+0x9a/0x103
      [<ffffffff8106a8c4>] run_timer_softirq+0x218/0x372
      [<ffffffff8106a803>] ? run_timer_softirq+0x157/0x372
      [<ffffffff8141f220>] ? neigh_stat_seq_open+0x41/0x41
      [<ffffffff8108f2f0>] ? mark_held_locks+0x6d/0x95
      [<ffffffff81062bb6>] __do_softirq+0x112/0x25a
      [<ffffffff8150d27c>] call_softirq+0x1c/0x30
      [<ffffffff81010bf5>] do_softirq+0x4b/0xa2
      [<ffffffff81062f65>] irq_exit+0x5d/0xcf
      [<ffffffff8150dc11>] smp_apic_timer_interrupt+0x7c/0x8a
      [<ffffffff8150baf3>] apic_timer_interrupt+0x73/0x80
      <EOI>  [<ffffffff8108f439>] ? trace_hardirqs_on_caller+0x121/0x158
      [<ffffffff814fc285>] ? __slab_free+0x30/0x24c
      [<ffffffff814fc283>] ? __slab_free+0x2e/0x24c
      [<ffffffff81204e74>] ? inode_doinit_with_dentry+0x2e9/0x41f
      [<ffffffff81204e74>] ? inode_doinit_with_dentry+0x2e9/0x41f
      [<ffffffff81204e74>] ? inode_doinit_with_dentry+0x2e9/0x41f
      [<ffffffff81130cb0>] kfree+0x108/0x131
      [<ffffffff81204e74>] inode_doinit_with_dentry+0x2e9/0x41f
      [<ffffffff81204fc6>] selinux_d_instantiate+0x1c/0x1e
      [<ffffffff81200f4f>] security_d_instantiate+0x21/0x23
      [<ffffffff81154625>] d_instantiate+0x5c/0x61
      [<ffffffff811563ca>] d_splice_alias+0xbc/0xd2
      [<ffffffff811b17ff>] ext4_lookup+0xba/0xeb
      [<ffffffff8114bf1e>] d_alloc_and_lookup+0x45/0x6b
      [<ffffffff8114cbea>] walk_component+0x215/0x3e8
      [<ffffffff8114cdf8>] lookup_last+0x3b/0x3d
      [<ffffffff8114daf3>] path_lookupat+0x82/0x2af
      [<ffffffff8110fc53>] ? might_fault+0xa5/0xac
      [<ffffffff8110fc0a>] ? might_fault+0x5c/0xac
      [<ffffffff8114c564>] ? getname_flags+0x31/0x1ca
      [<ffffffff8114dd48>] do_path_lookup+0x28/0x97
      [<ffffffff8114df2c>] user_path_at+0x59/0x96
      [<ffffffff811467ad>] ? cp_new_stat+0xf7/0x10d
      [<ffffffff811469a6>] vfs_fstatat+0x44/0x6e
      [<ffffffff811469ee>] vfs_lstat+0x1e/0x20
      [<ffffffff81146b3d>] sys_newlstat+0x1a/0x33
      [<ffffffff8108f439>] ? trace_hardirqs_on_caller+0x121/0x158
      [<ffffffff812535fe>] ? trace_hardirqs_on_thunk+0x3a/0x3f
      [<ffffffff8150af82>] system_call_fastpath+0x16/0x1b
    
    Reported-by: Dave Jones <davej@redhat.com>
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 22df13319d1fec30b8f9bcaadc295829647109bb
Author: Eric Dumazet <eric.dumazet@gmail.com>
Date:   Tue Aug 23 19:57:05 2011 +0000

    bridge: fix a possible use after free
    
    br_multicast_ipv6_rcv() can call pskb_trim_rcsum() and therefore skb
    head can be reallocated.
    
    Cache icmp6_type field instead of dereferencing twice the struct
    icmp6hdr pointer.
    
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 4b275d7efa1c4412f0d572fcd7f78ed0919370b3
Author: Yan, Zheng <zheng.z.yan@intel.com>
Date:   Tue Aug 23 22:54:33 2011 +0000

    bridge: Pseudo-header required for the checksum of ICMPv6
    
    Checksum of ICMPv6 is not properly computed because the pseudo header is not used.
    Thus, the MLD packet gets dropped by the bridge.
    
    Signed-off-by: Zheng Yan <zheng.z.yan@intel.com>
    Reported-by: Ang Way Chuang <wcang@sfc.wide.ad.jp>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit e05c4ad3ed874ee4f5e2c969e55d318ec654332c
Author: Yan, Zheng <zheng.z.yan@intel.com>
Date:   Tue Aug 23 22:54:37 2011 +0000

    mcast: Fix source address selection for multicast listener report
    
    Should check use count of include mode filter instead of total number
    of include mode filters.
    
    Signed-off-by: Zheng Yan <zheng.z.yan@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 814fd609fa98f3667974d8c27c4d75ef4ce041ea
Author: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
Date:   Tue Aug 23 23:31:42 2011 +0000

    MAINTAINERS: Update GIT trees for network development
    
    Remove -2.6 from net and net-next tree names.
    
    Signed-off-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 8b2a3827bb12430d932cd479b22d906baf08c212
Author: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
Date:   Wed Aug 24 21:38:07 2011 +0530

    ath9k: Fix PS wrappers in ath9k_set_coverage_class
    
    this callback is called during suspend/resume and also via iw command.
    it configures parameters like sifs, slottime, acktimeout in
    ath9k_hw_init_global_settings where few REG_READ, REG_RMW are also done
    and hence the need for PS wrappers
    
    Cc: stable@kernel.org
    Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 66cb54bd24086b2d871a03035de9b0e79b2b725e
Author: Alexey Khoroshilov <khoroshilov@ispras.ru>
Date:   Wed Aug 24 00:44:32 2011 +0400

    carl9170: Fix mismatch in carl9170_op_set_key mutex lock-unlock
    
    If is_main_vif(ar, vif) reports that we have to fall back
    to software encryption, we goto err_softw; before locking ar->mutex.
    As a result, we have unprotected call to carl9170_set_operating_mode
    and unmatched mutex_unlock.
    
    The patch fix the issue by adding mutex_lock before goto.
    
    Found by Linux Driver Verification project (linuxtesting.org).
    
    Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
    Cc: <stable@kernel.org>
    Acked-By: Christian Lamparter <chunkeey@googlemail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit c0764b2a4cdc41779460eb8796bc76e4fbddf339
Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date:   Tue Aug 23 16:35:31 2011 +0200

    at91: at91sam9261.c: fix typo in t2_clk alias for atmel_tcb.0
    
    This was a typo in clockdev declaration for at91sam9261 SoC.
    Fix the kernel hanging when switching clocksource to TC (tcb_clksrc).
    
    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
    Acked-by: Remy Bohmer <linux@bohmer.net>
    Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

commit 0ebb962e00a52b644433065d224ed89f72a84756
Author: Nick Bowler <nbowler@elliptictech.com>
Date:   Wed Jul 20 15:43:42 2011 +0100

    ARM: 7003/1: vexpress: Add clock definition for the SP805.
    
    It seems that an entry for the SP805 watchdog in the table of clocks was
    missing.  This results in the sp805_wdt driver rejecting the device with
    the following errors:
    
      sp805-wdt mb:wdt: Clock not found
      sp805-wdt mb:wdt: Probe Failed!!!
      sp805-wdt: probe of mb:wdt failed with error -2
    
    While not obviously stated in the hardware docs, the onboard SP810's
    "REFCLK" is connected to a 32.768KHz crystal, and this drives the
    watchdog.  Add a struct clk and corresponding lookup entry for it.
    
    Signed-off-by: Nick Bowler <nbowler@elliptictech.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 7a5e4877c14de0827dbda8efa5080089757a8733
Author: Luciano Coelho <coelho@ti.com>
Date:   Tue Aug 23 11:42:25 2011 +0300

    wl12xx: add max_sched_scan_ssids value to the hw description
    
    After commit 5a865ba, we require a separate value to indicate the
    number of supported SSIDs in scheduled scans.  This patch adds a
    proper value to the wl12xx driver.
    
    This fixes a regression in 3.1-rc3 where scheduled scans were not
    working properly with the wl12xx driver.
    
    Signed-off-by: Luciano Coelho <coelho@ti.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit a15f1c45f393982196c981a8df8b534cc9f3bb80
Author: Ido Yariv <ido@wizery.com>
Date:   Mon Aug 22 23:19:49 2011 +0300

    wl12xx: Fix validation of pm_runtime_get_sync return value
    
    wl1271_sdio_power_on checks if the return value of pm_runtime_get_sync
    is non-zero, and if so bails out.
    However, pm_runtime_get_sync can return a positive number which does not
    suggest an error has occurred. This is problematic for two reasons:
    
    1. The function will needlessly bail out without decrementing back the
       runtime PM reference counter.
    2. wl1271_power_on only checks if wl1271_power_on return value is
       negative. This means that wl1271_power_on will continue even if
       wl1271_sdio_power_on bailed out. As a result, sdio transactions will
       be initiated without properly enabling the sdio function and claiming
       the host. This could even lead to a kernel panic.
    
    Fix this by only checking that the return value of pm_runtime_get_sync
    is non-negative.
    
    Signed-off-by: Ido Yariv <ido@wizery.com>
    Acked-by: Luciano Coelho <coelho@ti.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 80900d0140a7648587982c8f299830e900e49165
Author: Ido Yariv <ido@wizery.com>
Date:   Mon Aug 22 23:19:48 2011 +0300

    wl12xx: Remove obsolete testmode NVS push command
    
    The testmode NVS push command is no longer in use. In addition, it has
    several implementation issues that prevent it from working correctly:
    
    1. wl1271_tm_cmd_configure relies on wl->chip.id being set. However,
       since the device was not necessarily booted by the time the function
       is called, wl->chip.id will be initialized to 0.
    2. The NVS file is fetched by calling request_firmware() before it is
       possible to push an NVS file.
    3. The maximum allowed size of nl binary payloads is not sufficient for
       pushing NVS files.
    4. Pushing 128x NVS files will always fail due to a bug in the
       validation code.
    5. In case the pushed NVS file is found invalid, the mutex will be kept
       locked and the nvs member will become a dangling pointer.
    
    Since this feature is not being used, remove it completely instead of
    fixing it.
    
    Signed-off-by: Ido Yariv <ido@wizery.com>
    Acked-by: Luciano Coelho <coelho@ti.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 886b66ef2f2d4984f6c72d86a9d8a3ffe4344fa5
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Fri Aug 19 22:14:47 2011 +0200

    bcma: add uevent to the bus, to autoload drivers
    
    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
    Acked-by: Rafał Miłecki <zajec5@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit b503c7a273c0a3018ad11ea8c513c639120afbf4
Author: Senthil Balasubramanian <senthilb@qca.qualcomm.com>
Date:   Fri Aug 19 18:43:06 2011 +0530

    ath9k_hw: Fix STA (AR9485) bringup issue due to incorrect MAC address
    
    Due to some recent optimization done in the way the mac address
    bytes are written into the OTP memory, some AR9485 chipsets were
    forced to use the first byte from the eeprom template and the
    remaining bytes are read from OTP.
    
    AR9485 happens to use generic eeprom template which has 0x1 as
    the first byte causes issues in bringing up the card.
    
    So fixed the eeprom template accordingly to address the issue.
    
    Cc: stable@kernel.org
    Cc: Paul Stewart <pstew@google.com>
    Signed-off-by: Senthil Balasubramanian <senthilb@qca.qualcomm.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 543cc38c8fe86deba4169977c61eb88491036837
Author: Stanislaw Gruszka <sgruszka@redhat.com>
Date:   Fri Aug 12 14:02:04 2011 +0200

    rt2x00: do not drop usb dev reference counter on suspend
    
    When hibernating ->resume may not be called by usb core, but disconnect
    and probe instead, so we do not increase the counter after decreasing
    it in ->supend. As a result we free memory early, and get crash when
    unplugging usb dongle.
    
    BUG: unable to handle kernel paging request at 6b6b6b9f
    IP: [<c06909b0>] driver_sysfs_remove+0x10/0x30
    *pdpt = 0000000034f21001 *pde = 0000000000000000
    Pid: 20, comm: khubd Not tainted 3.1.0-rc1-wl+ #20 LENOVO 6369CTO/6369CTO
    EIP: 0060:[<c06909b0>] EFLAGS: 00010202 CPU: 1
    EIP is at driver_sysfs_remove+0x10/0x30
    EAX: 6b6b6b6b EBX: f52bba34 ECX: 00000000 EDX: 6b6b6b6b
    ESI: 6b6b6b6b EDI: c0a0ea20 EBP: f61c9e68 ESP: f61c9e64
     DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
    Process khubd (pid: 20, ti=f61c8000 task=f6138270 task.ti=f61c8000)
    Call Trace:
     [<c06909ef>] __device_release_driver+0x1f/0xa0
     [<c0690b20>] device_release_driver+0x20/0x40
     [<c068fd64>] bus_remove_device+0x84/0xe0
     [<c068e12a>] ? device_remove_attrs+0x2a/0x80
     [<c068e267>] device_del+0xe7/0x170
     [<c06d93d4>] usb_disconnect+0xd4/0x180
     [<c06d9d61>] hub_thread+0x691/0x1600
     [<c0473260>] ? wake_up_bit+0x30/0x30
     [<c0442a39>] ? complete+0x49/0x60
     [<c06d96d0>] ? hub_disconnect+0xd0/0xd0
     [<c06d96d0>] ? hub_disconnect+0xd0/0xd0
     [<c0472eb4>] kthread+0x74/0x80
     [<c0472e40>] ? kthread_worker_fn+0x150/0x150
     [<c0809b3e>] kernel_thread_helper+0x6/0x10
    
    Cc: stable@kernel.org
    Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
    Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit ecb4433550f0620f3d1471ae7099037ede30a91e
Author: Stanislaw Gruszka <sgruszka@redhat.com>
Date:   Fri Aug 12 14:00:59 2011 +0200

    mac80211: fix suspend/resume races with unregister hw
    
    Do not call ->suspend, ->resume methods after we unregister wiphy. Also
    delete sta_clanup timer after we finish wiphy unregister to avoid this:
    
    WARNING: at lib/debugobjects.c:262 debug_print_object+0x85/0xa0()
    Hardware name: 6369CTO
    ODEBUG: free active (active state 0) object type: timer_list hint: sta_info_cleanup+0x0/0x180 [mac80211]
    Modules linked in: aes_i586 aes_generic fuse bridge stp llc autofs4 sunrpc cpufreq_ondemand acpi_cpufreq mperf ext2 dm_mod uinput thinkpad_acpi hwmon sg arc4 rt2800usb rt2800lib crc_ccitt rt2x00usb rt2x00lib mac80211 cfg80211 i2c_i801 iTCO_wdt iTCO_vendor_support e1000e ext4 mbcache jbd2 sd_mod crc_t10dif sr_mod cdrom yenta_socket ahci libahci pata_acpi ata_generic ata_piix i915 drm_kms_helper drm i2c_algo_bit video [last unloaded: microcode]
    Pid: 5663, comm: pm-hibernate Not tainted 3.1.0-rc1-wl+ #19
    Call Trace:
     [<c0454cfd>] warn_slowpath_common+0x6d/0xa0
     [<c05e05e5>] ? debug_print_object+0x85/0xa0
     [<c05e05e5>] ? debug_print_object+0x85/0xa0
     [<c0454dae>] warn_slowpath_fmt+0x2e/0x30
     [<c05e05e5>] debug_print_object+0x85/0xa0
     [<f8a808e0>] ? sta_info_alloc+0x1a0/0x1a0 [mac80211]
     [<c05e0bd2>] debug_check_no_obj_freed+0xe2/0x180
     [<c051175b>] kfree+0x8b/0x150
     [<f8a126ae>] cfg80211_dev_free+0x7e/0x90 [cfg80211]
     [<f8a13afd>] wiphy_dev_release+0xd/0x10 [cfg80211]
     [<c068d959>] device_release+0x19/0x80
     [<c05d06ba>] kobject_release+0x7a/0x1c0
     [<c07646a8>] ? rtnl_unlock+0x8/0x10
     [<f8a13adb>] ? wiphy_resume+0x6b/0x80 [cfg80211]
     [<c05d0640>] ? kobject_del+0x30/0x30
     [<c05d1a6d>] kref_put+0x2d/0x60
     [<c05d056d>] kobject_put+0x1d/0x50
     [<c08015f4>] ? mutex_lock+0x14/0x40
     [<c068d60f>] put_device+0xf/0x20
     [<c069716a>] dpm_resume+0xca/0x160
     [<c04912bd>] hibernation_snapshot+0xcd/0x260
     [<c04903df>] ? freeze_processes+0x3f/0x90
     [<c049151b>] hibernate+0xcb/0x1e0
     [<c048fdc0>] ? pm_async_store+0x40/0x40
     [<c048fe60>] state_store+0xa0/0xb0
     [<c048fdc0>] ? pm_async_store+0x40/0x40
     [<c05d0200>] kobj_attr_store+0x20/0x30
     [<c0575ea4>] sysfs_write_file+0x94/0xf0
     [<c051e26a>] vfs_write+0x9a/0x160
     [<c0575e10>] ? sysfs_open_file+0x200/0x200
     [<c051e3fd>] sys_write+0x3d/0x70
     [<c080959f>] sysenter_do_call+0x12/0x28
    
    Cc: stable@kernel.org
    Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 4475a0a93f368e57d5306d4cbe9318e8c1c90c41
Merge: 16a9d06 687beaa
Author: John W. Linville <linville@tuxdriver.com>
Date:   Mon Aug 22 14:20:09 2011 -0400

    Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth

commit 0d6cfa3a75f5cde5b3ca0dde748fd22625b4f34c
Author: Eric Bénard <eric@eukrea.com>
Date:   Mon Aug 22 15:41:46 2011 +0100

    ARM: 7051/1: cpuimx* boards: fix mach-types errors
    
    I made some changes to the entry in the ARM Machine Registry after
    submission which was the wrong thing to do.
    This patch should help to fix this error.
    
    Signed-off-by: Eric Bénard <eric@eukrea.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 5d747c6f2c9e1615685866251416268a0f648ffc
Author: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
Date:   Fri Aug 19 20:52:29 2011 +0900

    ARM: S5P: fix bug in spdif_clk_get_rate
    
    Should be passing the parent clk object when
    calling for parent rate.
    
    Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

commit d2edddf2b25863ec0893635662b0832f9965b543
Author: Kyungmin Park <kyungmin.park@samsung.com>
Date:   Fri Aug 19 20:25:05 2011 +0900

    ARM: EXYNOS4: Add restart hook for proper reboot
    
    This is required to use SWRESET.
    
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

commit 2b431ff74a850db3d5b804be3ac466b6ed7f516d
Author: Yulgon Kim <yulgon.kim@samsung.com>
Date:   Thu Aug 18 20:40:24 2011 +0900

    ARM: EXYNOS4: Increase reset delay for USB HOST PHY
    
    This patch increases reset delay from 50 usec to 80 usec for
    USB HOST PHY. In order to reset USB HOST PHY controller properly,
    a little extra time is required during its reset cycle.
    
    Signed-off-by: Yulgon Kim <yulgon.kim@samsung.com>
    Signed-off-by: Jingoo Han <jg1.han@samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

commit 3f6065dd9d2c947c8d68336f07bd721d3909a30d
Author: Marek Szyprowski <m.szyprowski@samsung.com>
Date:   Sat Aug 13 12:55:36 2011 +0900

    ARM: S5P: add required chained_irq_enter/exit to gpio-int code
    
    This patch adds chained IRQ enter/exit functions to gpio interrupt
    handler in order to function correctly on primary controllers with
    different methods of flow control.
    
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

commit 70b0e82bc7d03d33de5bceea92d419a9be4340ee
Author: Marek Szyprowski <m.szyprowski@samsung.com>
Date:   Sat Aug 13 12:55:36 2011 +0900

    ARM: EXYNOS4: add required chained_irq_enter/exit to eint code
    
    This patch adds chained IRQ enter/exit functions to external interrupt
    handler in order to function correctly on primary controllers with
    different methods of flow control.
    
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

commit 995b528ad25968472742c50fe964d44fac2b857a
Author: Marek Szyprowski <m.szyprowski@samsung.com>
Date:   Thu Aug 18 13:02:12 2011 +0900

    ARM: SAMSUNG: Add chained enrty/exit call to timer interrupt handler
    
    This patch adds chained IRQ enter/exit functions to timer
    interrupt handler in order to function correctly on primary
    controllers with different methods of flow control.
    
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

commit f98d429d7a7ff43d6e7c9bab239223f44a85264e
Author: Abhilash Kesavan <a.kesavan@samsung.com>
Date:   Sat Aug 13 10:40:52 2011 +0900

    ARM: S3C64XX: Fix build break in PM debug
    
    When S3C_PM_DEBUG_LED_SMDK is enabled for suspend/resume debugging, the following
    compilation error occurs:
    
    arch/arm/mach-s3c64xx/pm.c: In function 's3c_pm_debug_smdkled':
    arch/arm/mach-s3c64xx/pm.c:41: error: implicit declaration of function 'gpio_set_value'
    arch/arm/mach-s3c64xx/pm.c:41: error: implicit declaration of function 'S3C64XX_GPN'
    arch/arm/mach-s3c64xx/pm.c: In function 's3c64xx_pm_init':
    arch/arm/mach-s3c64xx/pm.c:184: error: implicit declaration of function 'gpio_request'
    arch/arm/mach-s3c64xx/pm.c:188: error: implicit declaration of function 'gpio_direction_output'
    
    Fix the error by including linux/gpio.h
    
    Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

commit 7e1291dea213c46b6649a9f6ec94b16f0d88f97c
Author: Abhilash Kesavan <a.kesavan@samsung.com>
Date:   Sat Aug 13 10:34:56 2011 +0900

    ARM: S5PV210: Fix build warning
    
    Fixed the following warning for S5PV210.
    
    arch/arm/mach-s5pv210/pm.c: In function 's5pv210_pm_add':
    arch/arm/mach-s5pv210/pm.c:139: warning: assignment from
    incompatible pointer type
    
    Also, staticized the function.
    
    Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

commit 5a1993f0c64f32cb4fb8a9f6caa981f377a11710
Author: Sylwester Nawrocki <s.nawrocki@samsung.com>
Date:   Fri Aug 12 19:03:16 2011 +0900

    ARM: EXYNOS4: Fix the IRQ definitions for MIPI CSIS device
    
    This is a regression fix after migration to the external GIC.
    The breakage has been introduced in commit 69644a8e23ab
    ("ARM: EXYNOS4: modify interrupt mappings for external GIC")
    
    Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    [kgene.kim@samsung.com: added commit id]
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

commit 6b875cb741249ec274393ba3abb929beeb465d25
Author: Huang Weiyi <weiyi.huang@gmail.com>
Date:   Fri Aug 12 18:43:57 2011 +0900

    ARM: EXYNOS4: remove duplicated inclusion
    
    Remove duplicated #include('s) in
      arch/arm/mach-exynos4/cpu.c
    
    Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

commit af8a9f63b45758591b8412d7ae3a0585227f09a2
Author: Jonghwan Choi <jhbird.choi@samsung.com>
Date:   Fri Aug 12 18:15:42 2011 +0900

    ARM: EXYNOS4: Fix wrong devname to support clkdev
    
    Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

commit c1a238aadf32daf23db13617fc0b401080c9ab04
Author: Kyungmin Park <kyungmin.park@samsung.com>
Date:   Thu Aug 11 16:36:41 2011 +0900

    ARM: EXYNOS4: Use the correct regulator names on universal_c210
    
    Use the correct regulator names for cpufreq
    
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

commit b8a297d3f842f4f7dae98cf85701da069204b0b1
Author: Kukjin Kim <kgene.kim@samsung.com>
Date:   Fri Jul 29 10:23:45 2011 +0900

    ARM: SAMSUNG: Fix Section mismatch in samsung_bl_set()
    
    WARNING: vmlinux.o(.text+0xf47c): Section mismatch in reference from the function samsung_bl_set() to the (unknown reference) .init.data:(unknown)
    The function samsung_bl_set() references
    the (unknown reference) __initdata (unknown).
    This is often because samsung_bl_set lacks a __initdata
    annotation or the annotation of (unknown) is wrong.
    
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

commit ac0d1516a2903226c19f3b4a4b323a9ffbede7d0
Author: Kukjin Kim <kgene.kim@samsung.com>
Date:   Thu Jul 28 08:16:34 2011 +0900

    ARM: S5P64X0: Replace irq_gc_ack() with irq_gc_ack_set_bit()
    
    According to commit 659fb32d1b67476f4ade25e9ea0e2642a5b9c4b5
    ("replace irq_gc_ack() with {set,clr}_bit variants"), this
    should be fixed.
    
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

commit 6c58addca802950917765380257bebec0998a7da
Author: Axel Lin <axel.lin@gmail.com>
Date:   Wed Aug 17 10:07:58 2011 +0100

    ARM: 7019/1: Footbridge: select CLKEVT_I8253 for ARCH_NETWINDER
    
    Since commit 8560a6cfc9818edde1fd8677961714b264ffa03d
    "arm: Footbridge: Use common i8253 clockevent",
    ARCH_NETWINDER needs to select CLKEVT_I8253.
    
    This patch fixes below build error with "make netwinder_defconfig".
    
      LD      .tmp_vmlinux1
    arch/arm/mach-footbridge/built-in.o: In function `isa_timer_init':
    isa-rtc.c:(.init.text+0x12c8): undefined reference to `clockevent_i8253_init'
    isa-rtc.c:(.init.text+0x12d0): undefined reference to `i8253_clockevent'
    arch/arm/mach-footbridge/built-in.o:(.data+0x198): undefined reference to `i8253_clockevent'
    make: *** [.tmp_vmlinux1] Error 1
    
    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    Acked-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 145e10e173c8adf4804334fb0dd10028300a7a7a
Author: Catalin Marinas <catalin.marinas@arm.com>
Date:   Mon Aug 15 11:04:41 2011 +0100

    ARM: 7015/1: ARM errata: Possible cache data corruption with hit-under-miss enabled
    
    This patch is a workaround for the 364296 ARM1136 r0p2 erratum (possible
    cache data corruption with hit-under-miss enabled). It sets the
    undocumented bit 31 in the auxiliary control register and the FI bit in
    the control register, thus disabling hit-under-miss without putting the
    processor into full low interrupt latency mode.
    
    Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
    Tested-by: Siarhei Siamashka <siarhei.siamashka@gmail.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 43c734be5571a4daad9f0a3e0b3229a1c0049917
Author: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Date:   Mon Aug 15 10:43:44 2011 +0100

    ARM: 7014/1: cache-l2x0: Fix L2 Cache size calculation.
    
    This patch fixes L2 Cache size calculations for L2C-210, L2C-310 and
    PL310, by changing the L2X0_AUX_CTRL_WAY_SIZE_MASK from 2 bits to 3
    bits.
    
    The Auxiliary Control Register for L2C-210, L2C-310 and PL310 has 3bits
    [19:17] for Way size, however the existing code only uses 2 bits to
    get this value. This results in incorrect cachesize calculations.
    
    It also results in performing operations on the whole cache when we
    erroneously decide that the range is big enough (due to l2x0_size being
    too small) and also prints incorrect cachesize.
    
    Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
    Acked-by: Will Deacon <will.deacon@arm.com>
    Cc: stable@kernel.org
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 505ed6fd82608bd4f26d487220ec40a3c5d0dded
Author: Petr Štetiar <ynezz@true.cz>
Date:   Fri Jun 17 11:11:59 2011 +0100

    ARM: 6967/1: ep93xx: ts72xx: fix board model detection
    
    Fix the obvious error in board detection logic, because according to the TS's
    manual, the model is stored in the least three significant bits. For example
    the byte read on my ts-7300 is 0x23 and the detection then fails.
    
    Cc: Ryan Mallon <ryan@bluewatersys.com>
    Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
    Signed-off-by: Petr Štetiar <ynezz@true.cz>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 2a004c686e7997ddb795dbce10b263e241f9bdaf
Author: Petr Štetiar <ynezz@true.cz>
Date:   Fri Jun 17 11:09:07 2011 +0100

    ARM: 6965/1: ep93xx: add model detection for ts-7300 and ts-7400 boards
    
    Cc: Ryan Mallon <ryan@bluewatersys.com>
    Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
    Signed-off-by: Petr Štetiar <ynezz@true.cz>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit e426f8e39bb612bfdd38fa7a75d10ba95787d1af
Merge: 73e0881 72dc53a
Author: Russell King <rmk+kernel@arm.linux.org.uk>
Date:   Sat Aug 13 09:43:19 2011 +0100

    Merge branch '3.1-fixes-for-rmk' of git://linux-arm.org/linux-2.6-wd into fixes

commit 72dc53acd50db066a5a5ebe1f39fae73d7e62aa8
Author: Will Deacon <will.deacon@arm.com>
Date:   Wed Aug 3 12:37:04 2011 +0100

    ARM: cache: detect VIPT aliasing I-cache on ARMv6
    
    The current cache detection code does not check for an aliasing
    I-cache if the D-cache is found to be VIPT aliasing.
    
    This patch fixes the problem by always checking for an aliasing
    I-cache on v6 and later.
    
    Signed-off-by: Will Deacon <will.deacon@arm.com>

commit dfc40b24c0a37593724f3317cd485c73ee878c18
Author: Will Deacon <will.deacon@arm.com>
Date:   Wed Jul 20 14:18:46 2011 +0100

    ARM: twd: register clockevents device before enabling PPI
    
    The smp_twd clockevents driver currently enables the local timer PPI
    before the clockevents device is registered. This can lead to a kernel
    panic if a spurious timer interrupt is generated before registration
    has completed since the kernel will treat it as an IPI timer.
    
    This patch moves the clockevents device registration before the IRQ
    unmasking so that we can always handle timer interrupts once they can
    occur.
    
    Acked-by: Marc Zyngier <marc.zyngier@arm.com>
    Signed-off-by: Will Deacon <will.deacon@arm.com>

commit 5cb843ca0f781b62dc9793b26926d0b8efef5576
Author: Will Deacon <will.deacon@arm.com>
Date:   Wed Jul 20 11:57:03 2011 +0100

    ARM: realview: ensure visibility of writes during reset
    
    The various reset routines in mach-realview rely on an FPGA to
    power-cycle the board after writing some magic runes to memory-mapped
    registers.
    
    This patch adds a dsb() following the writes, so that they become
    visible before we mdelay(1000) in the arch_reset code. Without this
    patch, the timeout would expire sporadically, causing the reset to fail.
    
    Signed-off-by: Will Deacon <will.deacon@arm.com>

commit 7fdd3c49629e8aab48dbd1b2f800854b0f93cba0
Author: Mark Rutland <mark.rutland@arm.com>
Date:   Fri Aug 12 10:42:48 2011 +0100

    ARM: perf: make name of arm_pmu_type consistent
    
    Commit f12482c9 ("ARM: 6974/1: pmu: refactor reservation") changed
    {release,reserve}_pmu to take an enum arm_pmu_type as a parameter, but
    inconsistently named the parameter `type' or `device'. It would be nice
    if these were consistent.
    
    This patch makes use of enum arm_pmu_type consistent, always using
    `type'. Related printks are updated, explicitly mentioning `type' also.
    
    Signed-off-by: Mark Rutland <mark.rutland@arm.com>
    Signed-off-by: Will Deacon <will.deacon@arm.com>

commit 49bef8331afefa4dd75f7124c50bde47168f5492
Author: Mark Rutland <Mark.Rutland@arm.com>
Date:   Wed Aug 10 10:20:17 2011 +0100

    ARM: perf: fix prototype of release_pmu
    
    Commit  f12482c9 ("ARM: 6974/1: pmu: refactor reservation") changed the
    prototype of release_pmu, but missed the stub for when
    CONFIG_CPU_HAS_PMU is not selected by the platform.
    
    This patch changes the prototype of the stub, preventing possible build
    failures when CONFIG_CPU_HAS_PMU is not selected.
    
    Signed-off-by: Mark Rutland <mark.rutland@arm.com>
    Signed-off-by: Will Deacon <will.deacon@arm.com>

commit 0ac8e58f3818795d02ac309bd57b4d93ec283a77
Author: Florian Fainelli <florian@openwrt.org>
Date:   Tue Aug 9 12:24:17 2011 +0100

    ARM: fix perf build with uclibc toolchains
    
    libio.h is not provided by uClibc, in order to be able to test the
    definition of __UCLIBC__ we need to include stdlib.h, which also
    includes stddef.h, providing the definition of 'NULL'.
    
    Signed-off-by: Florian Fainelli <florian@openwrt.org>
    Signed-off-by: Will Deacon <will.deacon@arm.com>

commit 687beaa0d1d937c327e2f97b4b4fa6c23ca70624
Author: Peter Hurley <peter@hurleysoftware.com>
Date:   Fri Aug 5 10:53:52 2011 -0400

    Bluetooth: cmtp: Fix session cleanup on failed conn add
    
    Once the session thread is running, cleanup must be handled
    by the session thread only.
    
    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

commit ff062ea109217329b88693bc9081da893eb8b71b
Author: Peter Hurley <peter@hurleysoftware.com>
Date:   Fri Aug 5 10:52:01 2011 -0400

    Bluetooth: hidp: Don't release device ref if never held
    
    When an hidp connection is added for a boot protocol input
    device, don't release a device reference that was never
    acquired. The device reference is acquired when the session
    is linked to the session list (which hasn't happened yet when
    hidp_setup_input is called).
    
    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

commit 615aedd6e5add8104f031b0d547285652d04d330
Author: Peter Hurley <peter@hurleysoftware.com>
Date:   Fri Aug 5 10:51:50 2011 -0400

    Bluetooth: hidp: Only free input device if failed register
    
    When an hidp connection is added for a boot protocol input
    device, only free the allocated device if device registration fails.
    Subsequent failures should only unregister the device (the input
    device api documents that unregister will also free the allocated
    device).
    
    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

commit 1c97e94c0b7c56319754ee6f9ccd2e93fe1ee2b3
Author: Peter Hurley <peter@hurleysoftware.com>
Date:   Fri Aug 5 10:51:34 2011 -0400

    Bluetooth: hidp: Fix memory leak of cached report descriptor
    
    Free the cached HID report descriptor on thread terminate.
    
    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

commit e9d5cb541b22aa651edc29990092ec5f8174cd39
Author: Peter Hurley <peter@hurleysoftware.com>
Date:   Fri Aug 5 10:51:26 2011 -0400

    Bluetooth: hidp: Fix session cleanup on failed conn add
    
    Once the session thread is running, cleanup must be
    handled by the session thread only.
    
    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

commit 7176522cdca1f0b78a1434b41761f0334511822a
Author: Peter Hurley <peter@hurleysoftware.com>
Date:   Fri Aug 5 10:44:21 2011 -0400

    Bluetooth: cmtp: Fix deadlock in session deletion
    
    Commit fada4ac339 introduced the usage of kthread API.
    kthread_stop is a blocking function which returns only when
    the thread exits. In this case, the thread can't exit because it's
    waiting for the write lock, which is being held by cmtp_del_connection()
    which is waiting for the thread to exit -- deadlock.
    
    Revert cmtp_reset_ctr to its original behavior: non-blocking signalling
    for the session to terminate.
    
    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

commit 751c10a56802513a6b057c8cf1552cecc1c9afde
Author: Peter Hurley <peter@hurleysoftware.com>
Date:   Fri Aug 5 10:41:35 2011 -0400

    Bluetooth: bnep: Fix deadlock in session deletion
    
    Commit f4d7cd4a4c introduced the usage of kthread API.
    kthread_stop is a blocking function which returns only when
    the thread exits. In this case, the thread can't exit because it's
    waiting for the write lock, which is being held by bnep_del_connection()
    which is waiting for the thread to exit -- deadlock.
    
    Use atomic_t/wake_up_process instead to signal to the thread to exit.
    
    Signed-off-by: Jaikumar Ganesh <jaikumar@google.com>
    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

commit 7bdb8a5cf17f66614a9897645efcd4ccc27535ee
Author: Szymon Janc <szymon@janc.net.pl>
Date:   Tue Jul 26 22:46:54 2011 +0200

    Bluetooth: Don't use cmd_timer to timeout HCI reset command
    
    No command should be send before Command Complete event for HCI
    reset is received. This fix regression introduced by commit
    6bd32326cda(Bluetooth: Use proper timer for hci command timout)
    for chips whose reset command takes longer to complete (e.g. CSR)
    resulting in next command being send before HCI reset completed.
    
    Signed-off-by: Szymon Janc <szymon@janc.net.pl>
    Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

commit 6be6b11f006840ba7d8d4b959b3fa0c522f8468a
Author: Chen Ganir <chen.ganir@ti.com>
Date:   Thu Jul 28 15:42:09 2011 +0300

    Bluetooth: Fixed wrong L2CAP Sock timer value
    
    L2CAP connection timeout needs to be assigned as miliseconds
    and not as jiffies.
    
    Signed-off-by: Chen Ganir <chen.ganir@ti.com>
    Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

commit a71a0cf4e9cdb1c43843977a1efc43f96f6efc21
Author: Peter Hurley <peter@hurleysoftware.com>
Date:   Mon Jul 25 18:36:26 2011 -0400

    Bluetooth: l2cap: Fix lost wakeup waiting for ERTM acks
    
    Fix race condition which can result in missing wakeup during
    l2cap socket shutdown.
    
    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

commit 3a3f5c7df55a1294c9e6e2d0b8cea604b137438f
Author: Peter Hurley <peter@hurleysoftware.com>
Date:   Sun Jul 24 00:11:10 2011 -0400

    Bluetooth: cmtp: Fix lost wakeup of session thread
    
    Fix race condition which can result in missing the wakeup intended
    to stop the session thread.
    
    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

commit 38d57555616afcdad7381b02b523d494327494cd
Author: Peter Hurley <peter@hurleysoftware.com>
Date:   Sun Jul 24 00:11:07 2011 -0400

    Bluetooth: bnep: Fix lost wakeup of session thread
    
    Fix race condition which can result in missing the wakeup intended
    to stop the session thread.
    
    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

commit 552b0d3cb9ff648aa503011ef50ca24019cd0f5f
Author: Peter Hurley <peter@hurleysoftware.com>
Date:   Sun Jul 24 00:11:01 2011 -0400

    Bluetooth: sco: Fix lost wakeups waiting to accept socket
    
    Fix race conditions which can cause lost wakeups (or missed signals)
    while waiting to accept a sco socket connection.
    
    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

commit f9a3c20aa07462108fc6fd759dea956053f020bb
Author: Peter Hurley <peter@hurleysoftware.com>
Date:   Sun Jul 24 00:10:52 2011 -0400

    Bluetooth: l2cap: Fix lost wakeups waiting to accept socket
    
    Fix race conditions which can cause lost wakeups (or misssed signals)
    while waiting to accept an l2cap socket connection.
    
    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

commit 9be4e3fbf2d3603e7a7010ede0697166738a788b
Author: Peter Hurley <peter@hurleysoftware.com>
Date:   Sun Jul 24 00:10:46 2011 -0400

    Bluetooth: Fix lost wakeups waiting for sock state change
    
    Fix race conditions which can cause lost wakeups while waiting
    for sock state to change.
    
    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

commit 950e2d51e866623e4c360280aa63b85ab66d3403
Author: Peter Hurley <peter@hurleysoftware.com>
Date:   Sun Jul 24 00:10:41 2011 -0400

    Bluetooth: rfcomm: Fix lost wakeups waiting to accept socket
    
    Fix race conditions which can cause lost wakeups (or missed
    signals) while waiting to accept an rfcomm socket connection.
    
    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

commit e5842cdb0f4f2c68f6acd39e286e5d10d8c073e8
Author: Peter Hurley <peter@hurleysoftware.com>
Date:   Sun Jul 24 00:10:35 2011 -0400

    Bluetooth: rfcomm: Remove unnecessary krfcommd event
    
    Removed superfluous event handling which was used to signal
    that the rfcomm kthread had been woken. This appears to have been
    used to prevent lost wakeups. Correctly ordering when the task
    state is set to TASK_INTERRUPTIBLE is sufficient to prevent lost wakeups.
    
    To prevent wakeups which occurred prior to initially setting
    TASK_INTERRUPTIBLE from being lost, the main work of the thread loop -
    rfcomm_process_sessions() - is performed prior to sleeping.
    
    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

commit 8e7c3d2e4ba18ee4cdcc1f89aec944fbff4ce735
Author: Ricardo Mendoza <ricmm@gentoo.org>
Date:   Wed Jul 13 16:04:29 2011 +0100

    Bluetooth: Add Toshiba laptops AR30XX device ID
    
    Blacklist Toshiba-branded AR3011 based AR5B195 [0930:0215] and add to
    ath3k.c for firmware loading.
    
    Signed-off-by: Ricardo Mendoza <ricmm@gentoo.org>
    Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

commit 4935f1c164ac528dff3538f97953b385ba500710
Author: Paul Bolle <pebolle@tiscali.nl>
Date:   Tue Aug 9 17:16:28 2011 +0200

    Bluetooth: btusb: be quiet on device disconnect
    
    Disabling the bluetooth usb device embedded in (some) ThinkPads tends to
    lead to errors like these:
        btusb_bulk_complete: hci0 urb ffff88011b9bfd68 failed to resubmit (19)
        btusb_intr_complete: hci0 urb ffff88011b46a318 failed to resubmit (19)
        btusb_bulk_complete: hci0 urb ffff88011b46a000 failed to resubmit (19)
    
    That is because usb_disconnect() doesn't "quiesces" pending urbs.
    
    Disconnecting a device is a normal thing to happen so it's no big deal
    that usb_submit_urb() returns -ENODEV. The simplest way to get rid of
    these errors is to stop treating that return as an error. Trivial,
    actually.
    
    While we're at it, add comments to be explicit about the reasons we're
    not complaining about -EPERM and -ENODEV.
    
    Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
    Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

commit 8475e2336cf80ba6e7b27715b4b3214d73c211ab
Author: Dan Carpenter <error27@gmail.com>
Date:   Wed Aug 3 17:22:45 2011 +0300

    Bluetooth: unlock if allocation fails in hci_blacklist_add()
    
    There was a small typo here so we never actually hit the goto which
    would call hci_dev_unlock_bh().
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

commit fe43756143c4efa6f8fdef07aa3ca4dc0be24ada
Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date:   Fri Jun 17 08:21:21 2011 +0000

    ARM: mach-shmobile: mackerel: Add USB-DMA ID
    
    This patch use channel0 as Tx, and channel1 as Rx
    
    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 4791d63bd40ec63c533060707dae0232b9969dc0
Merge: b362308 322a8b0
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Mon Aug 8 16:41:23 2011 +0900

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest

commit b3623080ff6974e696710b6c6eb4cdbf2bbab347
Author: Simon Horman <horms@verge.net.au>
Date:   Wed Aug 3 06:08:54 2011 +0000

    mmc: sdhi, mmcif: zboot: Correct clock disable logic
    
    This corrects a logic-error that I made in the original implementation.
    
    An alternate patch would be to just remove these lines and
    leave the clock running as it is reconfigured later on during
    boot anyway.
    
    Signed-off-by: Simon Horman <horms@verge.net.au>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit e80ca144ea902efa7aed446780fd9fad421fd8d3
Merge: c66d3fc 9a14a92
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Mon Aug 8 16:33:54 2011 +0900

    Merge branch 'common/core' into sh-latest

commit c66d3fcbf306af3c0c4b6f4e0d81467f89c67702
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Mon Aug 8 16:30:11 2011 +0900

    sh: Fix up fallout from cpuidle changes.
    
    Fixes up the pm_idle redefinition that was introduced with the earlier
    cpuidle changes.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 77c7ee51a062bb595c501ec098125a68999c20c3
Merge: 1ba7622 322a8b0
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Mon Aug 8 13:45:28 2011 +0900

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
    
    Conflicts:
    	drivers/tty/serial/sh-sci.c
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 1ba762209491e2496e58baffa3fd65d661f54404
Author: Magnus Damm <damm@opensource.se>
Date:   Wed Aug 3 03:47:36 2011 +0000

    serial: sh-sci: console Runtime PM support
    
    Add Runtime PM context save/restore support to
    the SCIF driver. Tested on the AP4EVB console.
    
    Signed-off-by: Magnus Damm <damm@opensource.se>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit c84b51e65ea2f256353c339bd87e991b7e64630f
Author: Paul Gortmaker <paul.gortmaker@windriver.com>
Date:   Sun Jul 31 21:36:35 2011 +0000

    sh: Fix conflicting definitions of ptrace_triggered
    
    The extra nmi argument is causing this compile fail:
    
      CC      arch/sh/kernel/ptrace_32.o
    arch/sh/kernel/ptrace_32.c:66:6: error: conflicting types for 'ptrace_triggered'
    arch/sh/include/asm/ptrace.h:126:13: note: previous declaration of 'ptrace_triggered' was here
    make[3]: *** [arch/sh/kernel/ptrace_32.o] Error 1
    
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 5beabc7fcd99856084e232b37d3280ce353eaf41
Author: Magnus Damm <damm@opensource.se>
Date:   Tue Aug 2 09:42:54 2011 +0000

    serial: sh-sci: fix DMA build by including dma-mapping.h
    
    Include dma-mapping.h to fix build of the sh-sci driver on
    SH-Mobile ARM (sh73a0) when CONFIG_SERIAL_SH_SCI_DMA=y:
    
    drivers/tty/serial/sh-sci.c: In function 'sci_rx_dma_release':
    drivers/tty/serial/sh-sci.c:1182:3: error: implicit declaration of function 'dma_free_coherent'
    drivers/tty/serial/sh-sci.c: In function 'work_fn_tx':
    drivers/tty/serial/sh-sci.c:1333:2: error: implicit declaration of function 'dma_sync_sg_for_device'
    drivers/tty/serial/sh-sci.c: In function 'sci_request_dma':
    drivers/tty/serial/sh-sci.c:1498:3: error: implicit declaration of function 'dma_map_sg'
    drivers/tty/serial/sh-sci.c:1527:3: error: implicit declaration of function 'dma_alloc_coherent'
    drivers/tty/serial/sh-sci.c:1527:10: warning: assignment makes pointer from integer without a cast
    make[3]: *** [drivers/tty/serial/sh-sci.o] Error 1
    make[2]: *** [drivers/tty/serial] Error 2
    make[1]: *** [drivers/tty] Error 2
    make: *** [drivers] Error 2
    
    Signed-off-by: Magnus Damm <damm@opensource.se>
    Tested-by: Simon Horman <horms@verge.net.au>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit ad75b88ac3792ae6a541d9b9fa84e379bd0b29dd
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Wed Aug 3 12:33:20 2011 +0900

    serial: sh-sci: Fix up default regtype probing.
    
    Presently the default regtype probing inadvertently bails out due to an
    inverted error check. This fixes it up, and gets platforms without
    explicit regtype specifications working again.
    
    Reported-by: Magnus Damm <damm@opensource.se>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit b79b3e05b1229d5b2fc2af71dc29701642577eba
Merge: b8e513a c5ad48f
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Mon Jul 25 17:22:29 2011 +0900

    Merge branch 'rmobile/sdio' into rmobile-latest

commit c5ad48f3117c4aae379b536f3270fc1efae945c0
Author: Simon Horman <horms@verge.net.au>
Date:   Mon Jun 20 23:00:12 2011 +0000

    ARM: mach-shmobile: ag5evm: SDHI requires waiting for idle
    
    The SDHI block on the ag5evm requires waiting for idle
    before writing to some registers.
    
    Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Cc: Magnus Damm <magnus.damm@gmail.com>
    Signed-off-by: Simon Horman <horms@verge.net.au>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 9a14a92c939aea1aaf27f5ad37b26b235acc2a65
Author: Magnus Damm <damm@opensource.se>
Date:   Fri Jul 15 10:58:55 2011 +0000

    sh: intc: enable both edges GPIO interrupts on sh7372
    
    IRQ-capable GPIOs on sh7372 can be configured to produce interrupts on
    both edges.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Acked-by: Magnus Damm <damm@opensource.se>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit b4300b72cfc01ea75b8aaede574bdfb04545d691
Author: David Engraf <david.engraf@sysgo.com>
Date:   Wed Jul 20 13:03:39 2011 +0000

    shwdt: fix usage of mod_timer
    
    This patch fixes the usage of mod_timer and makes the driver usable.
    mod_timer must be called with an absolute timeout in jiffies, the old
    implementation used a relative timeout thus the hardware watchdog was
    never triggered.
    
    Signed-off-by: David Engraf <david.engraf@sysgo.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 3f7e5e2423f6233f7665d54061ba7761ca90cf52
Author: Magnus Damm <damm@opensource.se>
Date:   Wed Jul 13 07:59:48 2011 +0000

    clocksource: sh_cmt: wait for CMCNT on init V2
    
    Add code to the CMT driver to wait for CMCNT V2. This to let
    the register value settle before starting the timer channel.
    Makes the driver more robust.
    
    Needed for CMT2 on sh7372 and certain CMT channels on sh73a0.
    
    Signed-off-by: Magnus Damm <damm@opensource.se>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit b8e513a2ecafb5bb068c00be98d584871afcd4c3
Author: Jesper Juhl <jj@chaosbits.net>
Date:   Sat Jul 9 21:11:14 2011 +0000

    ARM: static should be at beginning of declaration
    
    Make sure that the 'static' keywork is at the beginning of declaration
    for arch/arm/mach-shmobile/board-ap4evb.c
    
    This gets rid of warnings like
      warning: ‘static’ is not at beginning of declaration
    when building with -Wold-style-declaration (and/or -Wextra which also
    enables it).
    
    Signed-off-by: Jesper Juhl <jj@chaosbits.net>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 0ed61fc9da59ea45d56a6928653691cef14bab9b
Author: Magnus Damm <damm@opensource.se>
Date:   Thu Jun 30 09:22:50 2011 +0000

    ARM: mach-shmobile: Use CMT2 for timer on sh7372
    
    Switch the sh7372 CPU support to use CMT2 instead
    of CMT1 for system timer.
    
    CMT1 is located in the A3SP power domain while CMT2
    is located in the always-on power domain C5.
    
    This improves our PM situation - with CMT2 as timer
    we can power down A3SP and still access the timer.
    
    Signed-off-by: Magnus Damm <damm@opensource.se>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit afe48049ab1d0ca83afe45f9d5116bf4507741eb
Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date:   Fri Jun 17 08:21:10 2011 +0000

    ARM: mach-shmobile: sh7372: Add USB-DMAC support
    
    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>