1. 23 Jul, 2008 37 commits
  2. 22 Jul, 2008 3 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · c010b2f7
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (82 commits)
        ipw2200: Call netif_*_queue() interfaces properly.
        netxen: Needs to include linux/vmalloc.h
        [netdrvr] atl1d: fix !CONFIG_PM build
        r6040: rework init_one error handling
        r6040: bump release number to 0.18
        r6040: handle RX fifo full and no descriptor interrupts
        r6040: change the default waiting time
        r6040: use definitions for magic values in descriptor status
        r6040: completely rework the RX path
        r6040: call napi_disable when puting down the interface and set lp->dev accordingly.
        mv643xx_eth: fix NETPOLL build
        r6040: rework the RX buffers allocation routine
        r6040: fix scheduling while atomic in r6040_tx_timeout
        r6040: fix null pointer access and tx timeouts
        r6040: prefix all functions with r6040
        rndis_host: support WM6 devices as modems
        at91_ether: use netstats in net_device structure
        sfc: Create one RX queue and interrupt per CPU package by default
        sfc: Use a separate workqueue for resets
        sfc: I2C adapter initialisation fixes
    • Linus Torvalds's avatar
      Re-delete zombie 'drivers/usb/serial/airprime.c' file · 6069fb2e
      Linus Torvalds authored
      Stephen Rothwell points out that this file got deleted (on purpose) by
      commit 640c1bce ("USB: delete airprime
      driver"), but then almost immediately incorrectly resurrected by commit
       ("usb_serial: API all change").
      Delete it again.  If it comes back, we'll need to drive a stake through
      its heart.
      Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Acked-by: default avatarGreg KH <greg@kroah.com>
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · e9dd54da
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
        sparc32: pass -m32 when building vmlinux.lds
        sparc: Fixes the DRM layer build on sparc.
        ide: merge <asm-sparc/ide_64.h> with <asm-sparc/ide_32.h>
        ide: <asm-sparc/ide_64.h>: use __raw_{read,write}w()
        ide: <asm-sparc/ide_32.h>: use __raw_{read,write}w()
        ide: <asm-sparc/ide_64.h>: use %r0 for outw_be()
        sparc64: Do not define BIO_VMERGE_BOUNDARY.