1. 08 Dec, 2006 32 commits
  2. 07 Dec, 2006 8 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · ea14fad0
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (76 commits)
        [ARM] 4002/1: S3C24XX: leave parent IRQs unmasked
        [ARM] 4001/1: S3C24XX: shorten reboot time
        [ARM] 3983/2: remove unused argument to __bug()
        [ARM] 4000/1: Osiris: add third serial port in
        [ARM] 3999/1: RX3715: suspend to RAM support
        [ARM] 3998/1: VR1000: LED platform devices
        [ARM] 3995/1: iop13xx: add iop13xx support
        [ARM] 3968/1: iop13xx: add iop13xx_defconfig
        [ARM] Update mach-types
        [ARM] Allow gcc to optimise arm_add_memory a little more
        [ARM] 3991/1: i.MX/MX1 high resolution time source
        [ARM] 3990/1: i.MX/MX1 more precise PLL decode
        [ARM] 3986/1: H1940: suspend to RAM support
        [ARM] 3985/1: ixp4xx clocksource cleanup
        [ARM] 3984/1: ixp4xx/nslu2: Fix disk LED numbering (take 2)
        [ARM] 3994/1: ixp23xx: fix handling of pci master aborts
        [ARM] 3981/1: sched_clock for PXA2xx
        [ARM] 3980/1: extend the ARM Versatile sched_clock implementation from 32 to 63 bit
        [ARM] 3979/1: extend the SA11x0 sched_clock implementation from 32 to 63 bit period
        [ARM] 3978/1: macro to provide a 63-bit value from a 32-bit hardware counter
        ...
      ea14fad0
    • Linus Torvalds's avatar
      Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6 · 6ee7e78e
      Linus Torvalds authored
      * 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [IA64] replace kmalloc+memset with kzalloc
        [IA64] resolve name clash by renaming is_available_memory()
        [IA64] Need export for csum_ipv6_magic
        [IA64] Fix DISCONTIGMEM without VIRTUAL_MEM_MAP
        [PATCH] Add support for type argument in PAL_GET_PSTATE
        [IA64] tidy up return value of ip_fast_csum
        [IA64] implement csum_ipv6_magic for ia64.
        [IA64] More Itanium PAL spec updates
        [IA64] Update processor_info features
        [IA64] Add se bit to Processor State Parameter structure
        [IA64] Add dp bit to cache and bus check structs
        [IA64] SN: Correctly update smp_affinty mask
        [IA64] sparse cleanups
        [IA64] IA64 Kexec/kdump
      6ee7e78e
    • Russell King's avatar
      [ARM] Merge individual ARM sub-trees · 6705cda2
      Russell King authored
      Merge:
       Atmel AT91RM9200 and AT91SAM9260 changes
       General ARM developments
       Disconfiguous memory cleanups
       64-bit/32-bit division and sched_clock extension patches
       EP93xx support changes
       IOP support changes
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      6705cda2
    • Linus Torvalds's avatar
      Merge branch 'intx' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6 · 7f3af60e
      Linus Torvalds authored
      * 'intx' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
        PCI MSI: always toggle legacy-INTx-enable bit upon MSI entry/exit
      7f3af60e
    • Ben Dooks's avatar
      [ARM] 4002/1: S3C24XX: leave parent IRQs unmasked · d4f3e084
      Ben Dooks authored
      Do not bother masking/unmasking the parent IRQ
      for the mulitplexed EINT irqs, as masking the
      leaf seems to be fine.
      Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      d4f3e084
    • Ben Dooks's avatar
      [ARM] 4001/1: S3C24XX: shorten reboot time · 32d2deea
      Ben Dooks authored
      Cut down the time between requesting a reboot
      and actually getting the reboot to happen by
      a quarter.
      Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      32d2deea
    • Jeff Garzik's avatar
      PCI MSI: always toggle legacy-INTx-enable bit upon MSI entry/exit · 1769b46a
      Jeff Garzik authored
      The current code (prior to this change) would disable the PCI INTx
      legacy interrupt when enabling MSI... but only on PCI Express.  We
      should do this for all MSI devices, for safety's sake.
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      1769b46a
    • Nicolas Pitre's avatar
      [ARM] 3983/2: remove unused argument to __bug() · 7174d852
      Nicolas Pitre authored
      It appears that include/asm-arm/bug.h requires include/linux/stddef.h
      for the definition of NULL. It seems that stddef.h was always included
      indirectly in most cases, and that issue was properly fixed a while ago.
      
      Then commit 5047f09b incorrectly reverted
      change from commit ff10952a (bad dwmw2)
      and the problem recently resurfaced.
      
      Because the third argument to __bug() is never used anyway, RMK suggested
      getting rid of it entirely instead of readding #include <linux/stddef.h>
      which this patch does.
      Signed-off-by: default avatarNicolas Pitre <nico@cam.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      7174d852