1. 26 4月, 2012 8 次提交
  2. 24 4月, 2012 29 次提交
  3. 23 4月, 2012 3 次提交
    • D
      tcp: Fix build warning after tcp_{v4,v6}_init_sock consolidation. · ac807fa8
      David S. Miller 提交于
      net/ipv4/tcp_ipv4.c: In function 'tcp_v4_init_sock':
      net/ipv4/tcp_ipv4.c:1891:19: warning: unused variable 'tp' [-Wunused-variable]
      net/ipv6/tcp_ipv6.c: In function 'tcp_v6_init_sock':
      net/ipv6/tcp_ipv6.c:1836:19: warning: unused variable 'tp' [-Wunused-variable]
      Reported-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ac807fa8
    • L
      Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm · e895bd79
      Linus Torvalds 提交于
      Pull ARM fixes from Russell King:
       "Here's my usual Sunday push, just for one revert which PeterZ hollered
        about after last weeks push.  Other than that, all seems strangely
        quiet as far as fixes go in non-platform ARM land at the moment."
      
      * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
        Revert "ARM: 7359/2: smp_twd: Only wait for reprogramming on active cpus"
      e895bd79
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 205b9c9c
      Linus Torvalds 提交于
      Pull powerpc fixes from Benjamin Herrenschmidt:
       "Here are a few fixes for powerpc.  Note the addition to the generic
        irq.h.  This is part of a 3-patches regression fix for mpic due to
        changes in how IRQ_TYPE_NONE is being handled.  Thomas agreed to the
        addition of the new IRQ_TYPE_DEFAULT contant, however he hasn't
        replied with an Ack to the actual patch yet.  I don't to wait much
        longer with these patches tho."
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/mpic: Properly set default triggers
        irq: Add IRQ_TYPE_DEFAULT for use by PIC drivers
        powerpc/mpic: Fix confusion between hw_irq and virq
        powerpc/pmac: Don't add_timer() twice
        powerpc/eeh: Fix crash caused by null eeh_dev
        powerpc/mpc85xx: add MPIC message dts node
        powerpc/mpic_msgr: fix offset error when setting mer register
        powerpc/mpic_msgr: add lock for MPIC message global variable
        powerpc/mpic_msgr: fix compile error when SMP disabled
        powerpc: fix build when CONFIG_BOOKE_WDT is enabled
        powerpc/85xx: don't call of_platform_bus_probe() twice
      205b9c9c