1. 22 Mar, 2006 38 commits
  2. 21 Mar, 2006 2 commits
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · e952f31b
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [IA64-SGI] SN2-XP reduce kmalloc wrapper inlining
        [IA64] MCA: remove obsolete ifdef
        [IA64] MCA: update MCA comm field for user space tasks
        [IA64] MCA: print messages in MCA handler
        [IA64-SGI] - Eliminate SN pio_phys_xxx macros. Move to assembly
        [IA64] use icc defined constant
        [IA64] add __builtin_trap definition for icc build
        [IA64] clean up asm/intel_intrin.h
        [IA64] map ia64_hint definition to intel compiler intrinsic
        [IA64] hooks to wait for mmio writes to drain when migrating processes
        [IA64-SGI] driver bugfixes and hardware workarounds for CE1.0 asic
        [IA64-SGI] Handle SC env. powerdown events
        [IA64] Delete MCA/INIT sigdelayed code
        [IA64-SGI] sem2mutex ioc4.c
        [IA64] implement ia64 specific mutex primitives
        [IA64] Fix UP build with BSP removal support.
        [IA64] support for cpu0 removal
      e952f31b
    • Linus Torvalds's avatar
      Revert "V4L/DVB (3543): Fix Makefile to adapt to bt8xx/ conversion" · e0f4ab8a
      Linus Torvalds authored
      This reverts commit 08f1d0b9
      
      The "bt8xx/ conversion" for drivers/video/ hasn't actually percolated
      all the way to this tree, so the Makefile change escaped too soon.
      
      Build breakage noticed by Jeff Garzik <jeff@garzik.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      e0f4ab8a