15 Sep, 2009

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1623 commits)
    netxen: update copyright
    netxen: fix tx timeout recovery
    netxen: fix file firmware leak
    netxen: improve pci memory access
    netxen: change firmware write size
    tg3: Fix return ring size breakage
    netxen: build fix for INET=n
    cdc-phonet: autoconfigure Phonet address
    Phonet: back-end for autoconfigured addresses
    Phonet: fix netlink address dump error handling
    ipv6: Add IFA_F_DADFAILED flag
    net: Add DEVTYPE support for Ethernet based devices
    mv643xx_eth.c: remove unused txq_set_wrr()
    ucc_geth: Fix hangs after switching from full to half duplex
    ucc_geth: Rearrange some code to avoid forward declarations
    phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs
    drivers/net/phy: introduce missing kfree
    drivers/net/wan: introduce missing kfree
    net: force bridge module(s) to be GPL
    Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded
    ...

    Fixed up trivial conflicts:

    - arch/x86/include/asm/socket.h

    converted to in the x86 tree. The generic
    header has the same new #define's, so that works out fine.

    - drivers/net/tun.c

    fix conflict between 89f56d1e9 ("tun: reuse struct sock fields") that
    switched over to using 'tun->socket.sk' instead of the redundantly
    available (and thus removed) 'tun->sk', and 2b980dbd ("lsm: Add hooks
    to the TUN driver") which added a new 'tun->sk' use.

    Noted in 'next' by Stephen Rothwell.

    Linus Torvalds
     

09 Sep, 2009

1 commit

  • On Sun, 2009-09-06 at 12:26 -0700, Luis R. Rodriguez wrote:
    > On Sun, Sep 6, 2009 at 10:59 AM, Joe Perches wrote:
    > > On Thu, 2009-09-03 at 15:54 -0700, Luis R. Rodriguez wrote:
    > >> I'm pleased to announce the new home page to Atheros Linux wireless drivers:
    > >> http://wireless.kernel.org/en/users/Drivers/Atheros
    > > Perhaps add this to MAINTAINERS?
    > Fine by me, except ath5k and ath9k also have their own respective page
    > so those can also be added.

    (cc's trimmed and maintainers added)

    Perhaps this instead:

    Signed-off-by: Joe Perches
    Acked-by: Luis R. Rodriguez
    Signed-off-by: John W. Linville

    Joe Perches
     

08 Sep, 2009

1 commit


31 Aug, 2009

1 commit


29 Aug, 2009

2 commits


27 Aug, 2009

1 commit


20 Aug, 2009

1 commit


19 Aug, 2009

3 commits

  • There are a number of individual MMC drivers listed in MAINTAINERS. I
    didn't modify those records. Perhaps I should have.

    Cc:
    Cc: Manuel Lauss
    Cc: Nicolas Pitre
    Cc: Pierre Ossman
    Cc: Pavel Pisa
    Cc: Jarkko Lavinen
    Cc: Ben Dooks
    Cc: Sascha Sommer
    Cc: Ian Molton
    Cc: Joseph Chan
    Cc: Harald Welte
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • Signed-off-by: Joe Perches
    Acked-by: Benny Halevy
    Cc: Boaz Harrosh
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (60 commits)
    net: restore gnet_stats_basic to previous definition
    NETROM: Fix use of static buffer
    e1000e: fix use of pci_enable_pcie_error_reporting
    e1000e: WoL does not work on 82577/82578 with manageability enabled
    cnic: Fix locking in init/exit calls.
    cnic: Fix locking in start/stop calls.
    bnx2: Use mutex on slow path cnic calls.
    cnic: Refine registration with bnx2.
    cnic: Fix symbol_put_addr() panic on ia64.
    gre: Fix MTU calculation for bound GRE tunnels
    pegasus: Add new device ID.
    drivers/net: fixed drivers that support netpoll use ndo_start_xmit()
    via-velocity: Fix test of mii_status bit VELOCITY_DUPLEX_FULL
    rt2x00: fix memory corruption in rf cache, add a sanity check
    ixgbe: Fix receive on real device when VLANs are configured
    ixgbe: Do not return 0 in ixgbe_fcoe_ddp() upon FCP_RSP in DDP completion
    netxen: free napi resources during detach
    netxen: remove netxen workqueue
    ixgbe: fix issues setting rx-usecs with legacy interrupts
    can: fix oops caused by wrong rtnl newlink usage
    ...

    Linus Torvalds
     

14 Aug, 2009

3 commits


13 Aug, 2009

1 commit


10 Aug, 2009

2 commits


03 Aug, 2009

1 commit

  • Clearly, I am a glutton for punishment. I'll see if I can see Alan's
    changes through to the end, otherwise I'll be fending off a lot of bug
    reports for usb-serial devices.

    Cc: Alan Cox
    Signed-off-by: Greg Kroah-Hartman
    Signed-off-by: Linus Torvalds

    Greg Kroah-Hartman
     

31 Jul, 2009

2 commits


30 Jul, 2009

17 commits


25 Jul, 2009

2 commits


24 Jul, 2009

1 commit