1. 03 Dec, 2006 35 commits
  2. 02 Dec, 2006 5 commits
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 97be852f
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (118 commits)
        [netdrvr] skge: build fix
        [PATCH] NetXen: driver cleanup, removed unnecessary __iomem type casts
        [PATCH] PHY: Add support for configuring the PHY connection interface
        [PATCH] chelesio: transmit locking (plus bug fix).
        [PATCH] chelsio: statistics improvement
        [PATCH] chelsio: add MSI support
        [PATCH] chelsio: use standard CRC routines
        [PATCH] chelsio: cleanup pm3393 code
        [PATCH] chelsio: add 1G swcixw aupport
        [PATCH] chelsio: add support for other 10G boards
        [PATCH] chelsio: remove unused mutex
        [PATCH] chelsio: use kzalloc
        [PATCH] chelsio: whitespace fixes
        [PATCH] amd8111e use standard CRC lib
        [PATCH] sky2: msi enhancements.
        [PATCH] sky2: kfree_skb_any needed
        [PATCH] sky2: fixes for Yukon EC_U chip revisions
        [PATCH] sky2: add Dlink 560SX id
        [PATCH] sky2: receive error handling fix
        [PATCH] skge: don't clear MC state on link down
        ...
      97be852f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/drzeus/mmc · cdb54fac
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/drzeus/mmc:
        mmc: correct request error handling
        mmc: Flush block queue when removing card
        mmc: sdhci high speed support
        mmc: Support for high speed SD cards
        mmc: Fix mmc_delay() function
        mmc: Add support for mmc v4 wide-bus modes
        [PATCH] mmc: Add support for mmc v4 high speed mode
        trivial change for mmc/Kconfig: MMC_PXA does not mean only PXA255
        Make general code cleanups
        Add MMC_CAP_{MULTIWRITE,BYTEBLOCK} flags
        Platform device error handling cleanup
        Move register definitions away from the header file
        Change OMAP_MMC_{READ,WRITE} macros to use the host pointer
        Replace base with virt_base and phys_base
        mmc: constify mmc_host_ops vectors
        mmc: remove kernel_thread()
      cdb54fac
    • Linus Torvalds's avatar
      Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · 37043318
      Linus Torvalds authored
      * 'release' of master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
        Revert "ACPI: SCI interrupt source override"
      37043318
    • Jeff Garzik's avatar
      [netdrvr] skge: build fix · aae343d4
      Jeff Garzik authored
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      aae343d4
    • Len Brown's avatar
      Revert "ACPI: SCI interrupt source override" · 7bdd21ce
      Len Brown authored
      This reverts commit 281ea49b,
      which broke ACPI Interrupt source overrides that move
      the SCI from one IRQ in PIC mode to another in IOAPIC mode.
      
      If the SCI shared an interrupt line with another device,
      this would result in a "irq 18: nobody cared" type failure.
      
      http://bugzilla.kernel.org/show_bug.cgi?id=7601Signed-off-by: default avatarLen Brown <len.brown@intel.com>
      7bdd21ce