Permalink
Commits on Apr 6, 2012
  1. Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker…

    torvalds committed Apr 6, 2012
    …nel/git/arm/arm-soc
    
    Pull "ARM: SoC fixes: from Olof Johansson:
     "A bunch of fixes for regressions (and a few other problems) in
      3.4-rc1:
    
     - Fix for regression of mach/io.h cleanup on platforms with PCI or
       PCMCIA (adding back the include file on those for now)
     - AT91 fixes for usb and spi
     - smsc911x ethernet fixes for i.MX
     - smsc911x fixes for OMAP
     - gpio fixes for Tegra
     - A handful of build error and warning fixes for various platforms
     - cpufreq kconfig dependencies, build and lowlevel debug fixes for
       Samsung platforms
    
      In other words, more or less the regular collection of -rc1/2 type
      material.  A few of them, in particular the smsc911x for OMAP series,
      aren't technically regressions for 3.4, but they're valid fixes and
      we're still relatively early in the rc cycle so it seems appropriate
      to include them."
    
    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (60 commits)
      ARM: fix __io macro for PCMCIA
      ARM: EXYNOS: Fix compiler warning in dma.c file
      ARM: EXYNOS: fix ISO C90 warning
      ARM: OMAP2+: hwmod: Fix wrong SYSC_TYPE1_XXX_MASK bit definitions
      ARM: OMAP2+: hwmod: Make omap_hwmod_softreset wait for reset status
      ARM: OMAP2+: hwmod: Restore sysc after a reset
      ARM: OMAP2+: omap_hwmod: Allow io_ring wakeup configuration for all modules
      ARM: OMAP3: clock data: fill in some missing clockdomains
      ARM: OMAP4: clock data: Force a DPLL clkdm/pwrdm ON before a relock
      ARM: OMAP4: clock data: fix mult and div mask for USB_DPLL
      ARM: OMAP2+: powerdomain: Wait for powerdomain transition in pwrdm_state_switch()
      gpio: tegra: Iterate over the correct number of banks
      gpio: tegra: fix register address calculations for Tegra30
      EXYNOS: fix dependency for EXYNOS_CPUFREQ
      ARM: at91: dt: remove unit-address part for memory nodes
      ARM: at91: fix check of valid GPIO for SPI and USB
      USB: ehci-atmel: add needed of.h header file
      ARM: at91/NAND DT bindings: add comments
      ARM: at91/at91sam9x5.dtsi: fix NAND ale/cle in DT file
      USB: ohci-at91: trivial return code name change
      ...
  2. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Apr 6, 2012
    …/git/lliubbo/blackfin
    
    Pull a few blackfin compile fixes from Bob Liu.
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin:
      blackfin: update defconfig for bf527-ezkit
      blackfin: gpio: fix compile error if !CONFIG_GPIOLIB
      blackfin: fix L1 data A overflow link issue
  3. blackfin: update defconfig for bf527-ezkit

    lliubbo committed Apr 5, 2012
    To fix compile error:
    drivers/usb/musb/blackfin.h:51:3: error: #error "Please use PIO mode in MUSB
    driver on bf52x chip v0.0 and v0.1"
    make[4]: *** [drivers/usb/musb/blackfin.o] Error 1
    
    Signed-off-by: Bob Liu <lliubbo@gmail.com>
  4. blackfin: gpio: fix compile error if !CONFIG_GPIOLIB

    lliubbo committed Mar 27, 2012
    Add __gpio_get_value()/__gpio_set_value() to fix compile error if
    CONFIG_GPIOLIB = n.
    
    Signed-off-by: Bob Liu <lliubbo@gmail.com>
  5. blackfin: fix L1 data A overflow link issue

    vapier committed with lliubbo Mar 28, 2012
    This patch fix below compile error:
    "bfin-uclinux-ld: L1 data A overflow!"
    
    It is due to the recent lib/gen_crc32table.c change:
    46c5801
    crc32: bolt on crc32c
    
    it added 8KiB more data to __cacheline_aligned which cause blackfin L1 data
    cache overflow.
    
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
    Signed-off-by: Bob Liu <lliubbo@gmail.com>
  6. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Apr 6, 2012
    …/git/jikos/apm
    
    Pull an APM fix from Jiri Kosina:
     "One deadlock/race fix from Niel that got introduced when we were
      moving away from freezer_*_count() to wait_event_freezable()."
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:
      APM: fix deadlock in APM_IOC_SUSPEND ioctl
  7. Merge tag 'omap-fixes-a2-for-3.4rc' of git://git.kernel.org/pub/scm/l…

    olofj committed Apr 6, 2012
    …inux/kernel/git/pjw/omap-pending into fixes
    
    From Paul Walmsley:
    
    OMAP clock, powerdomain, clockdomain, and hwmod fixes intended for the
    early v3.4-rc series.  Also contains an HSMMC integration refinement
    of an earlier hardware bug workaround.
    
    * tag 'omap-fixes-a2-for-3.4rc' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending:
      ARM: OMAP2+: hwmod: Fix wrong SYSC_TYPE1_XXX_MASK bit definitions
      ARM: OMAP2+: hwmod: Make omap_hwmod_softreset wait for reset status
      ARM: OMAP2+: hwmod: Restore sysc after a reset
      ARM: OMAP2+: omap_hwmod: Allow io_ring wakeup configuration for all modules
      ARM: OMAP3: clock data: fill in some missing clockdomains
      ARM: OMAP4: clock data: Force a DPLL clkdm/pwrdm ON before a relock
      ARM: OMAP4: clock data: fix mult and div mask for USB_DPLL
      ARM: OMAP2+: powerdomain: Wait for powerdomain transition in pwrdm_state_switch()
      ARM: OMAP AM3517/3505: clock data: change EMAC clocks aliases
      ARM: OMAP: clock: fix race in disable all clocks
      ARM: OMAP4: hwmod data: Add aliases for McBSP fclk clocks
      ARM: OMAP3xxx: clock data: fix DPLL4 CLKSEL masks
      ARM: OMAP3xxx: HSMMC: avoid erratum workaround when transceiver is attached
      ARM: OMAP44xx: clockdomain data: correct the emu_sys_clkdm CLKTRCTRL data
Commits on Apr 5, 2012
  1. Merge branch 'akpm' (Andrew's patch-bomb)

    torvalds committed Apr 5, 2012
    Merge batch of fixes from Andrew Morton:
     "The simple_open() cleanup was held back while I wanted for laggards to
      merge things.
    
      I still need to send a few checkpoint/restore patches.  I've been
      wobbly about merging them because I'm wobbly about the overall
      prospects for success of the project.  But after speaking with Pavel
      at the LSF conference, it sounds like they're further toward
      completion than I feared - apparently davem is at the "has stopped
      complaining" stage regarding the net changes.  So I need to go back
      and re-review those patchs and their (lengthy) discussion."
    
    * emailed from Andrew Morton <akpm@linux-foundation.org>: (16 patches)
      memcg swap: use mem_cgroup_uncharge_swap fix
      backlight: add driver for DA9052/53 PMIC v1
      C6X: use set_current_blocked() and block_sigmask()
      MAINTAINERS: add entry for sparse checker
      MAINTAINERS: fix REMOTEPROC F: typo
      alpha: use set_current_blocked() and block_sigmask()
      simple_open: automatically convert to simple_open()
      scripts/coccinelle/api/simple_open.cocci: semantic patch for simple_open()
      libfs: add simple_open()
      hugetlbfs: remove unregister_filesystem() when initializing module
      drivers/rtc/rtc-88pm860x.c: fix rtc irq enable callback
      fs/xattr.c:setxattr(): improve handling of allocation failures
      fs/xattr.c:listxattr(): fall back to vmalloc() if kmalloc() failed
      fs/xattr.c: suppress page allocation failure warnings from sys_listxattr()
      sysrq: use SEND_SIG_FORCED instead of force_sig()
      proc: fix mount -t proc -o AAA
  2. memcg swap: use mem_cgroup_uncharge_swap fix

    Michal Hocko committed with torvalds Apr 5, 2012
    Although mem_cgroup_uncharge_swap has an empty placeholder for
    !CONFIG_CGROUP_MEM_RES_CTLR_SWAP the definition is placed in the
    CONFIG_SWAP ifdef block so we are missing the same definition for
    !CONFIG_SWAP which implies !CONFIG_CGROUP_MEM_RES_CTLR_SWAP.
    
    This has not been an issue before, because mem_cgroup_uncharge_swap was
    not called from !CONFIG_SWAP context.  But Hugh Dickins has a cleanup
    patch to call __mem_cgroup_commit_charge_swapin which is defined also
    for !CONFIG_SWAP.
    
    Let's move both the empty definition and declaration outside of the
    CONFIG_SWAP block to avoid the following compilation error:
    
      mm/memcontrol.c: In function '__mem_cgroup_commit_charge_swapin':
      mm/memcontrol.c:2837: error: implicit declaration of function 'mem_cgroup_uncharge_swap'
    
    if CONFIG_SWAP is disabled.
    
    Reported-by: David Rientjes <rientjes@google.com>
    Signed-off-by: Michal Hocko <mhocko@suse.cz>
    Cc: Hugh Dickins <hughd@google.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
    Cc: Johannes Weiner <hannes@cmpxchg.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. backlight: add driver for DA9052/53 PMIC v1

    Ashish Jangam committed with torvalds Apr 5, 2012
    DA9052/53 PMIC has capability to supply power for upto 3 banks of 6
    white serial LEDS.  It can also control intensity of independent banks
    and to drive these banks boost converter will provide up to 24V and
    forward current of max 50mA.
    
    This patch allows to control intensity of the individual WLEDs bank
    through DA9052/53 PMIC.
    
    This patch is functionally tested on Samsung SMDKV6410.
    
    Signed-off-by: David Dajun Chen <dchen@diasemi.com>
    Signed-off-by: Ashish Jangam <ashish.jangam@kpitcummins.com>
    Cc: Richard Purdie <rpurdie@rpsys.net>
    Cc: Samuel Ortiz <sameo@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. C6X: use set_current_blocked() and block_sigmask()

    mfleming committed with torvalds Apr 5, 2012
    As described in e6fa16a ("signal: sigprocmask() should do
    retarget_shared_pending()") the modification of current->blocked is
    incorrect as we need to check whether the signal we're about to block is
    pending in the shared queue.
    
    Also, use the new helper function introduced in commit 5e6292c
    ("signal: add block_sigmask() for adding sigmask to current->blocked")
    which centralises the code for updating current->blocked after
    successfully delivering a signal and reduces the amount of duplicate
    code across architectures.  In the past some architectures got this code
    wrong, so using this helper function should stop that from happening
    again.
    
    Acked-by: Mark Salter <msalter@redhat.com>
    Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
    Acked-by: Oleg Nesterov <oleg@redhat.com>
    Signed-off-by: Matt Fleming <matt.fleming@intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. MAINTAINERS: add entry for sparse checker

    sparsecli committed with torvalds Apr 5, 2012
    Signed-off-by: Christopher Li <sparse@chrisli.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. MAINTAINERS: fix REMOTEPROC F: typo

    JoePerches committed with torvalds Apr 5, 2012
    remoteproc.txt should have been .h
    
    Signed-off-by: Joe Perches <joe@perches.com>
    Cc: Ohad Ben-Cohen <ohad@wizery.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. alpha: use set_current_blocked() and block_sigmask()

    mfleming committed with torvalds Apr 5, 2012
    As described in e6fa16a ("signal: sigprocmask() should do
    retarget_shared_pending()") the modification of current->blocked is
    incorrect as we need to check for shared signals we're about to block.
    
    Also, use the new helper function introduced in commit 5e6292c
    ("signal: add block_sigmask() for adding sigmask to current->blocked")
    which centralises the code for updating current->blocked after
    successfully delivering a signal and reduces the amount of duplicate
    code across architectures.  In the past some architectures got this code
    wrong, so using this helper function should stop that from happening
    again.
    
    Cc: Richard Henderson <rth@twiddle.net>
    Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
    Cc: Matt Turner <mattst88@gmail.com>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Acked-by: Oleg Nesterov <oleg@redhat.com>
    Signed-off-by: Matt Fleming <matt.fleming@intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. simple_open: automatically convert to simple_open()

    bebarino committed with torvalds Apr 5, 2012
    Many users of debugfs copy the implementation of default_open() when
    they want to support a custom read/write function op.  This leads to a
    proliferation of the default_open() implementation across the entire
    tree.
    
    Now that the common implementation has been consolidated into libfs we
    can replace all the users of this function with simple_open().
    
    This replacement was done with the following semantic patch:
    
    <smpl>
    @ open @
    identifier open_f != simple_open;
    identifier i, f;
    @@
    -int open_f(struct inode *i, struct file *f)
    -{
    (
    -if (i->i_private)
    -f->private_data = i->i_private;
    |
    -f->private_data = i->i_private;
    )
    -return 0;
    -}
    
    @ has_open depends on open @
    identifier fops;
    identifier open.open_f;
    @@
    struct file_operations fops = {
    ...
    -.open = open_f,
    +.open = simple_open,
    ...
    };
    </smpl>
    
    [akpm@linux-foundation.org: checkpatch fixes]
    Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: Julia Lawall <Julia.Lawall@lip6.fr>
    Acked-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. scripts/coccinelle/api/simple_open.cocci: semantic patch for simple_o…

    JuliaLawall committed with torvalds Apr 5, 2012
    …pen()
    
    Find instances of an open-coded simple_open() and replace them with
    calls to simple_open().
    
    Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
    Reported-by: Stephen Boyd <sboyd@codeaurora.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  10. libfs: add simple_open()

    bebarino committed with torvalds Apr 5, 2012
    debugfs and a few other drivers use an open-coded version of
    simple_open() to pass a pointer from the file to the read/write file
    ops.  Add support for this simple case to libfs so that we can remove
    the many duplicate copies of this simple function.
    
    Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: Julia Lawall <Julia.Lawall@lip6.fr>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. hugetlbfs: remove unregister_filesystem() when initializing module

    Hillf Danton committed with torvalds Apr 5, 2012
    It was introduced by d1d5e05 ("hugetlbfs: return error code when
    initializing module") but as Al pointed out, is a bad idea.
    
    Quoted comments from Al:
     "Note that unregister_filesystem() in module init is *always* wrong;
      it's not an issue here (it's done too early to care about and
      realistically the box is not going anywhere - it'll panic when attempt
      to exec /sbin/init fails, if not earlier), but it's a damn bad
      example.
    
      Consider a normal fs module.  Somebody loads it and in parallel with
      that we get a mount attempt on that fs type.  It comes between
      register and failure exits that causes unregister; at that point we
      are screwed since grabbing a reference to module as done by mount is
      enough to prevent exit, but not to prevent the failure of init.  As
      the result, module will get freed when init fails, mounted fs of that
      type be damned."
    
    So remove it.
    
    Signed-off-by: Hillf Danton <dhillf@gmail.com>
    Cc: David Rientjes <rientjes@google.com>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. drivers/rtc/rtc-88pm860x.c: fix rtc irq enable callback

    Jett.Zhou committed with torvalds Apr 5, 2012
    According to 88pm860x spec, rtc alarm irq enable control is bit3 for
    RTC_ALARM_EN, so fix it.
    
    Signed-off-by: Jett.Zhou <jtzhou@marvell.com>
    Cc: Axel Lin <axel.lin@gmail.com>
    Cc: Haojian Zhuang <haojian.zhuang@marvell.com>
    Cc: Alessandro Zummo <a.zummo@towertech.it>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. fs/xattr.c:setxattr(): improve handling of allocation failures

    akpm00 committed with torvalds Apr 5, 2012
    This allocation can be as large as 64k.
    
     - Add __GFP_NOWARN so the a falied kmalloc() is silent
    
     - Fall back to vmalloc() if the kmalloc() failed
    
    Cc: Dave Chinner <david@fromorbit.com>
    Cc: Dave Jones <davej@codemonkey.org.uk>
    Cc: David Rientjes <rientjes@google.com>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  14. fs/xattr.c:listxattr(): fall back to vmalloc() if kmalloc() failed

    akpm00 committed with torvalds Apr 5, 2012
    This allocation can be as large as 64k.  As David points out, "falling
    back to vmalloc here is much better solution than failing to retreive
    the attribute - it will work no matter how fragmented memory gets.  That
    means we don't get incomplete backups occurring after days or months of
    uptime and successful backups".
    
    Cc: Dave Chinner <david@fromorbit.com>
    Cc: Dave Jones <davej@codemonkey.org.uk>
    Cc: David Rientjes <rientjes@google.com>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. fs/xattr.c: suppress page allocation failure warnings from sys_listxa…

    Dave Jones committed with torvalds Apr 5, 2012
    …ttr()
    
    This size is user controllable, up to a maximum of XATTR_LIST_MAX (64k).
    So it's trivial for someone to trigger a stream of order:4 page
    allocation errors.
    
    Signed-off-by: Dave Jones <davej@redhat.com>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: Dave Chinner <david@fromorbit.com>
    Acked-by: David Rientjes <rientjes@google.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. sysrq: use SEND_SIG_FORCED instead of force_sig()

    enomsg committed with torvalds Apr 5, 2012
    Change send_sig_all() to use do_send_sig_info(SEND_SIG_FORCED) instead
    of force_sig(SIGKILL).  With the recent changes we do not need force_ to
    kill the CLONE_NEWPID tasks.
    
    And this is more correct.  force_sig() can race with the exiting thread,
    while do_send_sig_info(group => true) kill the whole process.
    
    Some more notes from Oleg Nesterov:
    
    > Just one note. This change makes no difference for sysrq_handle_kill().
    > But it obviously changes the behaviour sysrq_handle_term(). I think
    > this is fine, if you want to really kill the task which blocks/ignores
    > SIGTERM you can use sysrq_handle_kill().
    >
    > Even ignoring the reasons why force_sig() is simply wrong here,
    > force_sig(SIGTERM) looks strange. The task won't be killed if it has
    > a handler, but SIG_IGN can't help. However if it has the handler
    > but blocks SIGTERM temporary (this is very common) it will be killed.
    
    Also,
    
    > force_sig() can't kill the process if the main thread has already
    > exited. IOW, it is trivial to create the process which can't be
    > killed by sysrq.
    
    So, this patch fixes the issue.
    
    Suggested-by: Oleg Nesterov <oleg@redhat.com>
    Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Acked-by: Oleg Nesterov <oleg@redhat.com>
    Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
    Cc: Alan Cox <alan@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  17. proc: fix mount -t proc -o AAA

    Vasiliy Kulikov committed with torvalds Apr 5, 2012
    The proc_parse_options() call from proc_mount() runs only once at boot
    time.  So on any later mount attempt, any mount options are ignored
    because ->s_root is already initialized.
    
    As a consequence, "mount -o <options>" will ignore the options.  The
    only way to change mount options is "mount -o remount,<options>".
    
    To fix this, parse the mount options unconditionally.
    
    Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
    Reported-by: Arkadiusz Miskiewicz <a.miskiewicz@gmail.com>
    Tested-by: Arkadiusz Miskiewicz <a.miskiewicz@gmail.com>
    Cc: Alexey Dobriyan <adobriyan@gmail.com>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  18. ARM: fix __io macro for PCMCIA

    Rob Herring committed with olofj Apr 4, 2012
    With commit c334bc1 (ARM: make mach/io.h include optional), PCMCIA was
    broken. PCMCIA depends on __io() returning a valid i/o address, and most
    ARM platforms require IO_SPACE_LIMIT be set to 0xffffffff for PCMCIA. This
    needs a better fix with a fixed i/o address mapping, but for now we just
    restore things to the previous behavior.
    
    This fixes at91, omap1, pxa and sa11xx. pxa needs io.h if PCI is enabled,
    but PCMCIA is not. sa11xx already has IO_SPACE_LIMIT set to 0xffffffff,
    so it doesn't need an io.h.
    
    Signed-off-by: Rob Herring <rob.herring@calxeda.com>
    Cc: Joachim Eastwood <joachim.eastwood@jotron.com>
    Cc: Russell King <linux@arm.linux.org.uk>
    Cc: Andrew Victor <linux@maxim.org.za>
    Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
    Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
    Tested-by: Paul Parsons <lost.distance@yahoo.com> (pxa270)
    Acked-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Olof Johansson <olof@lixom.net>
  19. Merge branch 'v3.4-samsung-fixes-1' of git://git.kernel.org/pub/scm/l…

    olofj committed Apr 5, 2012
    …inux/kernel/git/kgene/linux-samsung into fixes
    
    * 'v3.4-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
      ARM: EXYNOS: Fix compiler warning in dma.c file
      ARM: EXYNOS: fix ISO C90 warning
      ARM: EXYNOS: use chip_id reg in uncompress to select uart base phys
      ARM: EXYNOS: fix CONFIG_DEBUG_LL
      ARM: S3C24XX: fix missing common.h in mach-s3c24xx/
  20. Merge branch 'v3.4-cpufreq-exynos-fixes' of git://git.kernel.org/pub/…

    olofj committed Apr 5, 2012
    …scm/linux/kernel/git/kgene/linux-samsung into fixes
    
    * 'v3.4-cpufreq-exynos-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
      EXYNOS: fix dependency for EXYNOS_CPUFREQ
  21. Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git…

    olofj committed Apr 5, 2012
    …/tmlind/linux-omap into fixes
    
    From Tony Lindgren:
    
    Note that this also contains a set of fixes that are not regressions
    or oopses to properly deal with the smsc911x regulator issue.
    
    Basically the regulators must be per board file as the regulators
    can also come from drivers, such as twl4030. So it's best to dumb
    down gpmc-smsc911x.c to not even care about the regulators.
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
      ARM: OMAP: fix section mismatches in usb-host.c
      ARM: OMAP2+: Fix omap2+ build error
      ARM: OMAP2+: smsc911x: Add fixed board regulators
      ARM: OMAP2+: smsc911x: Remove regulator support from gmpc-smsc911x
      ARM: OMAP2+: smsc911x: Remove unused rate calculation
      ARM: OMAP2+ smsc911x: Fix possible stale smsc911x flags
      ARM: OMAP2+: smsc911x: Remove odd gpmc_cfg/board_data redirection
      ARM: OMAP3+: fix oops triggered in omap_prcm_register_chain_handler(v1)
      ARM: OMAP2+: OPP: allow OPP enumeration to continue if device is not present
      arm: omap3: pm34xx.c: Replace printk() with appropriate pr_*()
      arm: omap3: pm34xx.c: Fix omap3_pm_init() error out paths
      ARM: OMAP4: Workaround the OCP synchronisation issue with 32K synctimer.
      ARM: OMAP4: prm: fix interrupt register offsets
      ARM: OMAP: hwmod: Use sysc_fields->srst_shift and get rid of hardcoded SYSC_TYPE2_SOFTRESET_MASK
  22. Merge branch 'at91-fixes' of git://github.com/at91linux/linux-at91 in…

    olofj committed Apr 5, 2012
    …to fixes
    
    * 'at91-fixes' of git://github.com/at91linux/linux-at91:
      ARM: at91: dt: remove unit-address part for memory nodes
      ARM: at91: fix check of valid GPIO for SPI and USB
      USB: ehci-atmel: add needed of.h header file
      ARM: at91/NAND DT bindings: add comments
      ARM: at91/at91sam9x5.dtsi: fix NAND ale/cle in DT file
      USB: ohci-at91: trivial return code name change
      USB: ohci-at91: change maximum number of ports
      USB: ohci-at91: rework and fix initialization
      ARM: at91/dts: USB host vbus is active low
      ARM: at91/USB host: specify and handle properly vbus_pin_active_low
      USB: ohci-at91: fix vbus_pin_active_low handling
      ARM: at91/at91sam9x5: add clkdev entries for DMA controllers
  23. Merge branch 'for-3.4/fixes-for-rc2' of git://git.kernel.org/pub/scm/…

    olofj committed Apr 5, 2012
    …linux/kernel/git/swarren/linux-tegra into fixes
    
    * 'for-3.4/fixes-for-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
      gpio: tegra: Iterate over the correct number of banks
      gpio: tegra: fix register address calculations for Tegra30
  24. ARM: EXYNOS: Fix compiler warning in dma.c file

    Sachin Kamat committed with kgene Apr 5, 2012
    Fixes the following warning:
    warning: 'dma_dmamask' defined but not used [-Wunused-variable]
    
    Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  25. ARM: EXYNOS: fix ISO C90 warning

    Il Han committed with kgene Apr 5, 2012
    ISO C90 forbids mixed declarations and code.
    Fix it.
    
    Signed-off-by: Il Han <corone.il.han@gmail.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  26. Merge branches 'clock_fixes_3.4rc', 'clockdomain_fixes_3.4rc', 'hsmmc…

    Paul Walmsley committed Apr 5, 2012
    …_erratum_2_1_1_128_refine_3.4rc1', 'hwmod_data_fixes_a_3.4rc', 'hwmod_fixes_a2_3.4rc' and 'powerdomain_fixes_a_3.4rc' into omap-fixes-a2-for-3.4rc-branch
  27. ARM: OMAP2+: hwmod: Fix wrong SYSC_TYPE1_XXX_MASK bit definitions

    Vaibhav Hiremath committed with Paul Walmsley Feb 17, 2012
    In the SYSC_TYPE1_XXX_MASK configuration, SYSC_XXX_SHIFT macro
    is used which is not defined anywhere in the kernel.
    Until now the build was going through successfully, since it
    is not being used anywhere in kernel.
    
    This bug got introduced by the commit
    358f0e6 ("OMAP3: hwmod: support
    to specify the offset position of various SYSCONFIG register bits.")
    
    Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
    Acked-by: Benoit Cousson <b-cousson@ti.com>
    Signed-off-by: Paul Walmsley <paul@pwsan.com>
  28. ARM: OMAP2+: hwmod: Make omap_hwmod_softreset wait for reset status

    Rajendra Nayak committed with Paul Walmsley Mar 13, 2012
    omap_hwmod_softreset() does not seem to wait for reset status
    after doing a softreset. Make it use _ocp_softreset() instead
    which does this correctly.
    
    Signed-off-by: Rajendra Nayak <rnayak@ti.com>
    Cc: Benoit Cousson <b-cousson@ti.com>
    Cc: Paul Walmsley <paul@pwsan.com>
    Cc: Anand Gadiyar <gadiyar@ti.com>
    Cc: Shubhrajyoti D <shubhrajyoti@ti.com>
    Signed-off-by: Paul Walmsley <paul@pwsan.com>