1. 30 Oct, 2006 3 commits
    • Linus Torvalds's avatar
      Revert "r8169: mac address change support" · 209ad53b
      Linus Torvalds authored
      This reverts commit a2b98a69.
      
      As per Guennadi Liakhovetski, the mac address change support code breaks
      some normal uses (_without_ any address changes), and until it's all
      sorted out, we're better off without it.
      
      Says Francois:
      
        "Go revert it.
      
         Despite what I claimed, I can not find a third-party confirmation by
         email that it works elsewhere.
      
         It would probably be enough to remove the call to
         __rtl8169_set_mac_addr() in rtl8169_hw_start() though."
      
      See also
      
      	http://bugzilla.kernel.org/show_bug.cgi?id=6032
      
      Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
      Acked-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      209ad53b
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 9ca0e547
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] 3914/1: [Jornada7xx] - Typo Fix in cpu-sa1110.c (b != B)
        [ARM] 3913/1: n2100: fix IRQ routing for second ethernet port
        [ARM] Add KBUILD_IMAGE target support
        [ARM] Fix suspend oops caused by PXA2xx PCMCIA driver
        [ARM] Fix i2c-pxa slave mode support
        [ARM] 3900/1: Fix VFP Division by Zero exception handling.
        [ARM] 3899/1: Fix the normalization of the denormal double precision number.
        [ARM] 3909/1: Disable UWIND_INFO for ARM (again)
        [ARM] Add __must_check to uaccess functions
        [ARM] Add realview SMP default configuration
        [ARM] Fix SMP irqflags support
      9ca0e547
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6 · c0f79c4c
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6:
        [PATCH] PCMCIA: fix __must_check warnings
        [PATCH] PCMCIA: handle sysfs, PCI errors
        [PATCH] Export soc_common_drv_pcmcia_remove to allow modular PCMCIA.
        [PATCH] ioremap balanced with iounmap for drivers/pcmcia
        [PATCH] pcmcia: au1000_generic fix
        [PATCH] i82092: wire up errors from pci_register_driver()
        [PATCH] CONFIG_PM=n slim: drivers/pcmcia/*
        [PATCH] pcmcia/ds: driver layer error checking
        [PATCH] pcmcia: update alloc_io_space for conflict checking for multifunction PC card
        [PATCH] pcmcia: add more IDs to hostap_cs.c
        [PATCH] pcmcia: at91_cf update
      c0f79c4c
  2. 29 Oct, 2006 11 commits
  3. 28 Oct, 2006 26 commits