Permalink
Commits on Oct 28, 2012
  1. Merge branch 'distro-3.6' into pf-3.6

    Oleksandr Natalenko committed Oct 28, 2012
  2. Merge branch 'version-3.6' into pf-3.6

    Oleksandr Natalenko committed Oct 28, 2012
  3. distro-3.6: bump to v3.6.6-pf

    Oleksandr Natalenko committed Oct 28, 2012
  4. version-3.6: bump to v3.6.6-pf

    Oleksandr Natalenko committed Oct 28, 2012
  5. fix merge conflict

    Oleksandr Natalenko committed Oct 28, 2012
  6. Linux 3.6.4

    gregkh committed Oct 28, 2012
  7. mac80211: call drv_get_tsf() in sleepable context

    commit 55fabef upstream.
    
    The call to drv_get/set_tsf() was put on the workqueue to perform tsf
    adjustments since that function might sleep. However it ended up inside
    a spinlock, whose critical section must be atomic. Do tsf adjustment
    outside the spinlock instead, and get rid of a warning.
    
    Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    twpedersen committed with gregkh Oct 6, 2012
  8. sparc64: Fix bit twiddling in sparc_pmu_enable_event().

    [ Upstream commit e793d8c ]
    
    There was a serious disconnect in the logic happening in
    sparc_pmu_disable_event() vs. sparc_pmu_enable_event().
    
    Event disable is implemented by programming a NOP event into the PCR.
    
    However, event enable was not reversing this operation.  Instead, it
    was setting the User/Priv/Hypervisor trace enable bits.
    
    That's not sparc_pmu_enable_event()'s job, that's what
    sparc_pmu_enable() and sparc_pmu_disable() do .
    
    The intent of sparc_pmu_enable_event() is clear, since it first clear
    out the event type encoding field.  So fix this by OR'ing in the event
    encoding rather than the trace enable bits.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    davem330 committed with gregkh Oct 16, 2012
  9. sparc64: Like x86 we should check current->mm during perf backtrace g…

    …eneration.
    
    [ Upstream commit 08280e6 ]
    
    If the MM is not active, only report the top-level PC.  Do not try to
    access the address space.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    davem330 committed with gregkh Oct 15, 2012
  10. sparc64: fix ptrace interaction with force_successful_syscall_return()

    [ Upstream commit 55c2770 ]
    
    we want syscall_trace_leave() called on exit from any syscall;
    skipping its call in case we'd done force_successful_syscall_return()
    is broken...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Al Viro committed with gregkh Oct 11, 2012
  11. ipv6: addrconf: fix /proc/net/if_inet6

    [ Upstream commit 9f0d3c2 ]
    
    Commit 1d57830 (ipv6/addrconf: speedup /proc/net/if_inet6 filling)
    added bugs hiding some devices from if_inet6 and breaking applications.
    
    "ip -6 addr" could still display all IPv6 addresses, while "ifconfig -a"
    couldnt.
    
    One way to reproduce the bug is by starting in a shell :
    
    unshare -n /bin/bash
    ifconfig lo up
    
    And in original net namespace, lo device disappeared from if_inet6
    
    Reported-by: Jan Hinnerk Stosch <janhinnerk.stosch@gmail.com>
    Tested-by: Jan Hinnerk Stosch <janhinnerk.stosch@gmail.com>
    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Cc: Mihai Maruseac <mihai.maruseac@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Eric Dumazet committed with gregkh Oct 16, 2012
  12. tcp: resets are misrouted

    [ Upstream commit 4c67525 ]
    
    After commit e2446ea ("tcp_v4_send_reset: binding oif to iif in no
    sock case").. tcp resets are always lost, when routing is asymmetric.
    Yes, backing out that patch will result in misrouting of resets for
    dead connections which used interface binding when were alive, but we
    actually cannot do anything here.  What's died that's died and correct
    handling normal unbound connections is obviously a priority.
    
    Comment to comment:
    > This has few benefits:
    >   1. tcp_v6_send_reset already did that.
    
    It was done to route resets for IPv6 link local addresses. It was a
    mistake to do so for global addresses. The patch fixes this as well.
    
    Actually, the problem appears to be even more serious than guaranteed
    loss of resets.  As reported by Sergey Soloviev <sol@eqv.ru>, those
    misrouted resets create a lot of arp traffic and huge amount of
    unresolved arp entires putting down to knees NAT firewalls which use
    asymmetric routing.
    
    Signed-off-by: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Alexey Kuznetsov committed with gregkh Oct 12, 2012
  13. RDS: fix rds-ping spinlock recursion

    [ Upstream commit 5175a5e ]
    
    This is the revised patch for fixing rds-ping spinlock recursion
    according to Venkat's suggestions.
    
    RDS ping/pong over TCP feature has been broken for years(2.6.39 to
    3.6.0) since we have to set TCP cork and call kernel_sendmsg() between
    ping/pong which both need to lock "struct sock *sk". However, this
    lock has already been hold before rds_tcp_data_ready() callback is
    triggerred. As a result, we always facing spinlock resursion which
    would resulting in system panic.
    
    Given that RDS ping is only used to test the connectivity and not for
    serious performance measurements, we can queue the pong transmit to
    rds_wq as a delayed response.
    
    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    CC: Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
    CC: David S. Miller <davem@davemloft.net>
    CC: James Morris <james.l.morris@oracle.com>
    Signed-off-by: Jie Liu <jeff.liu@oracle.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    pibroch committed with gregkh Oct 8, 2012
  14. ipvs: fix ARP resolving for direct routing mode

    [ Upstream commit ad4d3ef ]
    
    After the change "Make neigh lookups directly in output packet path"
    (commit a263b30) IPVS can not reach the real server for DR mode
    because we resolve the destination address from IP header, not from
    route neighbour. Use the new FLOWI_FLAG_KNOWN_NH flag to request
    output routes with known nexthop, so that it has preference
    on resolving.
    
    Signed-off-by: Julian Anastasov <ja@ssi.bg>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Julian Anastasov committed with gregkh Oct 8, 2012
  15. ipv4: Add FLOWI_FLAG_KNOWN_NH

    [ Upstream commit c92b965 ]
    
    Add flag to request that output route should be
    returned with known rt_gateway, in case we want to use
    it as nexthop for neighbour resolving.
    
    	The returned route can be cached as follows:
    
    - in NH exception: because the cached routes are not shared
    	with other destinations
    - in FIB NH: when using gateway because all destinations for
    	NH share same gateway
    
    	As last option, to return rt_gateway!=0 we have to
    set DST_NOCACHE.
    
    Signed-off-by: Julian Anastasov <ja@ssi.bg>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Julian Anastasov committed with gregkh Oct 8, 2012
  16. ipv4: introduce rt_uses_gateway

    [ Upstream commit 155e833 ]
    
    Add new flag to remember when route is via gateway.
    We will use it to allow rt_gateway to contain address of
    directly connected host for the cases when DST_NOCACHE is
    used or when the NH exception caches per-destination route
    without DST_NOCACHE flag, i.e. when routes are not used for
    other destinations. By this way we force the neighbour
    resolving to work with the routed destination but we
    can use different address in the packet, feature needed
    for IPVS-DR where original packet for virtual IP is routed
    via route to real IP.
    
    Signed-off-by: Julian Anastasov <ja@ssi.bg>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Julian Anastasov committed with gregkh Oct 8, 2012
  17. ipv4: make sure nh_pcpu_rth_output is always allocated

    [ Upstream commit f8a1717 ]
    
    Avoid checking nh_pcpu_rth_output in fast path,
    abort fib_info creation on alloc_percpu failure.
    
    Signed-off-by: Julian Anastasov <ja@ssi.bg>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Julian Anastasov committed with gregkh Oct 8, 2012
  18. ipv4: fix forwarding for strict source routes

    [ Upstream commit e0adef0 ]
    
    After the change "Adjust semantics of rt->rt_gateway"
    (commit f8126f1) rt_gateway can be 0 but ip_forward() compares
    it directly with nexthop. What we want here is to check if traffic
    is to directly connected nexthop and to fail if using gateway.
    
    Signed-off-by: Julian Anastasov <ja@ssi.bg>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Julian Anastasov committed with gregkh Oct 8, 2012
  19. ipv4: fix sending of redirects

    [ Upstream commit e81da0e ]
    
    After "Cache input routes in fib_info nexthops" (commit
    d2d68ba) and "Elide fib_validate_source() completely when possible"
    (commit 7a9bc9b) we can not send ICMP redirects. It seems we
    should not cache the RTCF_DOREDIRECT flag in nh_rth_input because
    the same fib_info can be used for traffic that is not redirected,
    eg. from other input devices or from sources that are not in same subnet.
    
    	As result, we have to disable the caching of RTCF_DOREDIRECT
    flag and to force source validation for the case when forwarding
    traffic to the input device. If traffic comes from directly connected
    source we allow redirection as it was done before both changes.
    
    	Avoid setting RTCF_DOREDIRECT if IN_DEV_TX_REDIRECTS
    is disabled, this can avoid source address validation and to
    help caching the routes.
    
    	After the change "Adjust semantics of rt->rt_gateway"
    (commit f8126f1) we should make sure our ICMP_REDIR_HOST messages
    contain daddr instead of 0.0.0.0 when target is directly connected.
    
    Signed-off-by: Julian Anastasov <ja@ssi.bg>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Julian Anastasov committed with gregkh Oct 8, 2012
  20. vlan: don't deliver frames for unknown vlans to protocols

    [ Upstream commit 48cc32d ]
    
    6a32e4f made the vlan code skip marking
    vlan-tagged frames for not locally configured vlans as PACKET_OTHERHOST if
    there was an rx_handler, as the rx_handler could cause the frame to be received
    on a different (virtual) vlan-capable interface where that vlan might be
    configured.
    
    As rx_handlers do not necessarily return RX_HANDLER_ANOTHER, this could cause
    frames for unknown vlans to be delivered to the protocol stack as if they had
    been received untagged.
    
    For example, if an ipv6 router advertisement that's tagged for a locally not
    configured vlan is received on an interface with macvlan interfaces attached,
    macvlan's rx_handler returns RX_HANDLER_PASS after delivering the frame to the
    macvlan interfaces, which caused it to be passed to the protocol stack, leading
    to ipv6 addresses for the announced prefix being configured even though those
    are completely unusable on the underlying interface.
    
    The fix moves marking as PACKET_OTHERHOST after the rx_handler so the
    rx_handler, if there is one, sees the frame unchanged, but afterwards,
    before the frame is delivered to the protocol stack, it gets marked whether
    there is an rx_handler or not.
    
    Signed-off-by: Florian Zumbiehl <florz@florz.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Florian Zumbiehl committed with gregkh Oct 7, 2012
  21. skge: Add DMA mask quirk for Marvell 88E8001 on ASUS P5NSLI motherboard

    [ Upstream commit a2af139 ]
    
    Marvell 88E8001 on an ASUS P5NSLI motherboard is unable to send/receive
    packets on a system with >4gb ram unless a 32bit DMA mask is used.
    
    This issue has been around for years and a fix was sent 3.5 years ago, but
    there was some debate as to whether it should instead be fixed as a PCI quirk.
    http://www.spinics.net/lists/netdev/msg88670.html
    
    However, 18 months later a similar workaround was introduced for another
    chipset exhibiting the same problem.
    http://www.spinics.net/lists/netdev/msg142287.html
    
    Signed-off-by: Graham Gower <graham.gower@gmail.com>
    Signed-off-by: Jan Ceuleers <jan.ceuleers@computer.org>
    Acked-by: Stephen Hemminger <shemminger@vyatta.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    grahamgower committed with gregkh Oct 8, 2012
  22. ipv4: Don't report stale pmtu values to userspace

    [ Upstream commit ee9a8f7 ]
    
    We report cached pmtu values even if they are already expired.
    Change this to not report these values after they are expired
    and fix a race in the expire time calculation, as suggested by
    Eric Dumazet.
    
    Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Steffen Klassert committed with gregkh Oct 8, 2012
  23. ipv4: Don't create nh exeption when the device mtu is smaller than th…

    …e reported pmtu
    
    [ Upstream commit 7f92d33 ]
    
    When a local tool like tracepath tries to send packets bigger than
    the device mtu, we create a nh exeption and set the pmtu to device
    mtu. The device mtu does not expire, so check if the device mtu is
    smaller than the reported pmtu and don't crerate a nh exeption in
    that case.
    
    Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Steffen Klassert committed with gregkh Oct 7, 2012
  24. ipv4: Always invalidate or update the route on pmtu events

    [ Upstream commit d851c12 ]
    
    Some protocols, like IPsec still cache routes. So we need to invalidate
    the old route on pmtu events to avoid the reuse of stale routes.
    We also need to update the mtu and expire time of the route if we already
    use a nh exception route, otherwise we ignore newly learned pmtu values
    after the first expiration.
    
    With this patch we always invalidate or update the route on pmtu events.
    
    Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Steffen Klassert committed with gregkh Oct 7, 2012
  25. ipv6: GRO should be ECN friendly

    [ Upstream commit 51ec040 ]
    
    IPv4 side of the problem was addressed in commit a9e050f
    (net: tcp: GRO should be ECN friendly)
    
    This patch does the same, but for IPv6 : A Traffic Class mismatch
    doesnt mean flows are different, but instead should force a flush
    of previous packets.
    
    This patch removes artificial packet reordering problem.
    
    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Cc: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Eric Dumazet committed with gregkh Oct 5, 2012
  26. net: Fix skb_under_panic oops in neigh_resolve_output

    [ Upstream commit e1f1650 ]
    
    The retry loop in neigh_resolve_output() and neigh_connected_output()
    call dev_hard_header() with out reseting the skb to network_header.
    This causes the retry to fail with skb_under_panic. The fix is to
    reset the network_header within the retry loop.
    
    Signed-off-by: Ramesh Nagappa <ramesh.nagappa@ericsson.com>
    Reviewed-by: Shawn Lu <shawn.lu@ericsson.com>
    Reviewed-by: Robert Coulson <robert.coulson@ericsson.com>
    Reviewed-by: Billie Alsup <billie.alsup@ericsson.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ramesh.nagappa@gmail.com committed with gregkh Oct 5, 2012
  27. net: remove skb recycling

    [ Upstream commits acb600d
      and 66eef59. ]
    
    Over time, skb recycling infrastructure got litle interest and
    many bugs. Generic rx path skb allocation is now using page
    fragments for efficient GRO / TCP coalescing, and recyling
    a tx skb for rx path is not worth the pain.
    
    Last identified bug is that fat skbs can be recycled
    and it can endup using high order pages after few iterations.
    
    With help from Maxime Bizon, who pointed out that commit
    87151b8 (net: allow pskb_expand_head() to get maximum tailroom)
    introduced this regression for recycled skbs.
    
    Instead of fixing this bug, lets remove skb recycling.
    
    Drivers wanting really hot skbs should use build_skb() anyway,
    to allocate/populate sk_buff right before netif_receive_skb()
    
    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Cc: Maxime Bizon <mbizon@freebox.fr>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Eric Dumazet committed with gregkh Oct 5, 2012
  28. infiniband: pass rdma_cm module to netlink_dump_start

    [ Upstream commit 809d5fc ]
    
    set netlink_dump_control.module to avoid panic.
    
    Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
    Cc: Roland Dreier <roland@kernel.org>
    Cc: Sean Hefty <sean.hefty@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Gao feng committed with gregkh Oct 4, 2012
  29. netlink: add reference of module in netlink_dump_start

    [ Upstream commit 6dc878a ]
    
    I get a panic when I use ss -a and rmmod inet_diag at the
    same time.
    
    It's because netlink_dump uses inet_diag_dump which belongs to module
    inet_diag.
    
    I search the codes and find many modules have the same problem.  We
    need to add a reference to the module which the cb->dump belongs to.
    
    Thanks for all help from Stephen,Jan,Eric,Steffen and Pablo.
    
    Change From v3:
    change netlink_dump_start to inline,suggestion from Pablo and
    Eric.
    
    Change From v2:
    delete netlink_dump_done,and call module_put in netlink_dump
    and netlink_sock_destruct.
    
    Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Gao feng committed with gregkh Oct 4, 2012
  30. drm/i915: Use cpu relocations if the object is in the GTT but not map…

    …pable
    
    commit 504c726 upstream.
    
    This prevents the case of unbinding the object in order to process the
    relocations through the GTT and then rebinding it only to then proceed
    to use cpu relocations as the object is now in the CPU write domain. By
    choosing to use cpu relocations up front, we can therefore avoid the
    rebind penalty.
    
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Cc: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ickle committed with gregkh Aug 23, 2012
  31. media: au0828: fix case where STREAMOFF being called on stopped strea…

    …m causes BUG()
    
    commit a595c1c upstream.
    
    We weren't checking whether the resource was in use before calling
    res_free(), so applications which called STREAMOFF on a v4l2 device that
    wasn't already streaming would cause a BUG() to be hit (MythTV).
    
    Reported-by: Larry Finger <larry.finger@lwfinger.net>
    Reported-by: Jay Harbeston <jharbestonus@gmail.com>
    Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    dheitmueller committed with gregkh Aug 7, 2012
  32. xtensa: add missing system calls to the syscall table

    commit 7216cab upstream.
    
    Add the following system calls to the syscall table:
    
    fallocate
    sendmmsg
    umount2
    syncfs
    epoll_create1
    inotify_init1
    signalfd4
    dup3
    pipe2
    timerfd_create
    timerfd_settime
    timerfd_gettime
    eventfd2
    preadv
    pwritev
    fanotify_init
    fanotify_mark
    process_vm_readv
    process_vm_writev
    name_to_handle_at
    open_by_handle_at
    sync_file_range
    perf_event_open
    rt_tgsigqueueinfo
    clock_adjtime
    prlimit64
    kcmp
    
    Note that we have to use the 'sys_sync_file_range2' version, so that
    the 64-bit arguments are aligned correctly to the argument registers.
    
    Signed-off-by: Chris Zankel <chris@zankel.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    czankel committed with gregkh Oct 19, 2012
  33. amd64_edac:__amd64_set_scrub_rate(): avoid overindexing scrubrates[]

    commit 168bfee upstream.
    
    If none of the elements in scrubrates[] matches, this loop will cause
    __amd64_set_scrub_rate() to incorrectly use the n+1th element.
    
    As the function is designed to use the final scrubrates[] element in the
    case of no match, we can fix this bug by simply terminating the array
    search at the n-1th element.
    
    Boris: this code is fragile anyway, see here why:
    http://marc.info/?l=linux-kernel&m=135102834131236&w=2
    
    It will be rewritten more robustly soonish.
    
    Reported-by: Denis Kirjanov <kirjanov@gmail.com>
    Cc: Doug Thompson <dougthompson@xmission.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Andrew Morton committed with gregkh Oct 23, 2012
  34. iommu/tegra: smmu: Fix deadly typo

    commit d0078e7 upstream.
    
    Fix a deadly typo in macro definition.
    
    Signed-off-by: Hiro Sugawara <hsugawara@nvidia.com>
    Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com>
    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Hiro Sugawara committed with gregkh Oct 18, 2012
  35. pinctrl: fix missing unlock on error in pinctrl_groups_show()

    commit b4dd784 upstream.
    
    Add the missing unlock on the error handle path in function
    pinctrl_groups_show().
    
    Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Wei Yongjun committed with gregkh Oct 22, 2012