1. 23 Jun, 2006 26 commits
  2. 22 Jun, 2006 14 commits
    • Greg Kroah-Hartman's avatar
      5d9fd169
    • Greg Kroah-Hartman's avatar
      [PATCH] USB: get USB suspend to work again · 0517587e
      Greg Kroah-Hartman authored
      Yeah, it's a hack, but it is only temporary until Alan's patches
      reworking this area make it in.  We really should not care what devices
      below us are doing, especially when we do not really know what type of
      devices they are.  This patch relies on the fact that the endpoint
      devices do not have a driver assigned to us.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      0517587e
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc · 8542e589
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc:
        [ARM] 3565/1: AT91RM9200 MMC update
        [MMC] Convert all hosts except mmci to use data->blksz
      8542e589
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · 6f3cafce
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (21 commits)
        [ARM] 3629/1: S3C24XX: fix missing bracket in regs-dsc.h
        [ARM] 3537/1: Rework DMA-bounce locking for finer granularity
        [ARM] 3601/1: i.MX/MX1 DMA error handling for signaled channels only
        [ARM] 3597/1: ixp4xx/nslu2: Board support for new LED subsystem
        [ARM] 3595/1: ixp4xx/nas100d: Board support for new LED subsystem
        [ARM] 3626/1: ARM EABI: fix syscall restarting
        [ARM] 3628/1: S3C24XX: add get_rate call to struct clk
        [ARM] 3627/1: S3C24XX: split s3c2410 clocks from core clocks
        [ARM] 3613/1: S3C2410: Add sysdev and sysclass
        [ARM] 3624/1: Report true modem control line states
        [ARM] 3620/2: ixp23xx: add uengine loader support
        [ARM] 3618/1: add defconfig for logicpd pxa270 card engine
        [ARM] 3617/1: ep93xx: fix slightly incorrect timer tick rate
        [ARM] 3616/1: fix timer handler wrap logic for a number of platforms
        [ARM] 3615/1: ixp23xx: use platform devices for physmap flash
        [ARM] 3614/1: ep93xx: use platform devices for physmap flash
        [ARM] 3621/1: fix compilation breakage for pnx4008
        [ARM] 3623/1: pnx4008: move GPIO-related defines to gpio.h
        [ARM] 3622/1: pnx4008: remove clk_use/clk_unuse
        [ARM] Enable VFP to be built when non-VFP capable CPUs are selected
        ...
      6f3cafce
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial · 0c97f524
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial:
        [ARM] 3600/1: increase amba-pl010 UART_NR to 8
        [ARM] 3571/1: netX: serial driver for Hilscher netX
      0c97f524
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq · c71bd694
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
        [CPUFREQ] Fix ondemand vs suspend deadlock
        [CPUFREQ] Fix powernow-k8 SMP kernel on UP hardware bug.
        [PATCH] redirect speedstep-centrino maintainer mail to cpufreq list
        [CPUFREQ] correct powernow-k8 fid/vid masks for extended parts
        [CPUFREQ] Clarify powernow-k8 cpu_family statements
      c71bd694
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 065a3e17
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (33 commits)
        [PATCH] myri10ge - drop workaround pci_save_state() disabling MSI
        [PATCH] myri10ge - drop workaround for the missing AER ext cap on nVidia CK804
        via-velocity: the link is not correctly detected when the device starts
        [PATCH] add b44 to maintainers
        [PATCH] WAN: ioremap() failure checks in drivers
        [PATCH] WAN: register_hdlc_device() doesn't need dev_alloc_name()
        [PATCH] skb_padto()-area fixes in 8390, wavelan
        [PATCH] make drivers/net/forcedeth.c:nv_update_pause() static
        [PATCH] network driver for Hilscher netx
        [PATCH] Dereference in tokenring/olympic.c
        [PATCH] Array overrun in drivers/net/wireless/wavelan.c
        [PATCH] Remove useless check in drivers/net/pcmcia/xirc2ps_cs.c
        [PATCH] 8139cp: add ethtool eeprom support
        [PATCH] 8139cp: fix eeprom read command length
        [PATCH] b44: update b44 Kconfig entry
        [PATCH] b44: update version to 1.01
        [PATCH] b44: add wol for old nic
        [PATCH] b44: add parameter
        [PATCH] b44: add wol
        [PATCH] b44: fix manual speed/duplex/autoneg settings
        ...
      065a3e17
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 45c091bb
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (139 commits)
        [POWERPC] re-enable OProfile for iSeries, using timer interrupt
        [POWERPC] support ibm,extended-*-frequency properties
        [POWERPC] Extra sanity check in EEH code
        [POWERPC] Dont look for class-code in pci children
        [POWERPC] Fix mdelay badness on shared processor partitions
        [POWERPC] disable floating point exceptions for init
        [POWERPC] Unify ppc syscall tables
        [POWERPC] mpic: add support for serial mode interrupts
        [POWERPC] pseries: Print PCI slot location code on failure
        [POWERPC] spufs: one more fix for 64k pages
        [POWERPC] spufs: fail spu_create with invalid flags
        [POWERPC] spufs: clear class2 interrupt status before wakeup
        [POWERPC] spufs: fix Makefile for "make clean"
        [POWERPC] spufs: remove stop_code from struct spu
        [POWERPC] spufs: fix spu irq affinity setting
        [POWERPC] spufs: further abstract priv1 register access
        [POWERPC] spufs: split the Cell BE support into generic and platform dependant parts
        [POWERPC] spufs: dont try to access SPE channel 1 count
        [POWERPC] spufs: use kzalloc in create_spu
        [POWERPC] spufs: fix initial state of wbox file
        ...
      
      Manually resolved conflicts in:
      	drivers/net/phy/Makefile
      	include/asm-powerpc/spu.h
      45c091bb
    • Brice Goglin's avatar
      [PATCH] myri10ge - drop workaround pci_save_state() disabling MSI · bfcbb008
      Brice Goglin authored
      We don't need to restore the state right after saving it for later recovery
      since commit 99dc804d (PCI: disable msi mode
      in pci_disable_device) now prevents pci_save_state() from disabling MSI.
      Signed-off-by: default avatarBrice Goglin <brice@myri.com>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      bfcbb008
    • Brice Goglin's avatar
      [PATCH] myri10ge - drop workaround for the missing AER ext cap on nVidia CK804 · 69eb887b
      Brice Goglin authored
      We don't need to hardcode the AER capability of the nVidia CK804 chipset
      anymore since commit cf34a8e0 (PCI: nVidia
      quirk to make AER PCI-E extended capability visible) now makes sure that
      this cap will be available to pci_find_ext_capability().
      Signed-off-by: default avatarBrice Goglin <brice@myri.com>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      69eb887b
    • Jeff Garzik's avatar
    • Gary Zambrano's avatar
      [PATCH] add b44 to maintainers · 39105890
      Gary Zambrano authored
      Add b44 to the MAINTAINERS file.
      Signed-off-by: default avatarGary Zambrano <zambrano@broadcom.com>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      39105890
    • Krzysztof Halasa's avatar
      [PATCH] WAN: ioremap() failure checks in drivers · 4446065a
      Krzysztof Halasa authored
      Eric Sesterhenn found that pci200syn initialization lacks return
      statement in ioremap() error path (coverity bug id #195). It looks
      like more WAN drivers have problems with ioremap().
      Signed-off-by: default avatarKrzysztof Halasa <khc@pm.waw.pl>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      4446065a
    • Krzysztof Halasa's avatar
      [PATCH] WAN: register_hdlc_device() doesn't need dev_alloc_name() · 4a31e348
      Krzysztof Halasa authored
      David Boggs noticed that register_hdlc_device() no longer needs
      to call dev_alloc_name() as it's called by register_netdev().
      register_hdlc_device() is currently equivalent to register_netdev().
      
      hdlc_setup() is now EXPORTed as per David's request.
      Signed-off-by: default avatarKrzysztof Halasa <khc@pm.waw.pl>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      4a31e348