1. 11 Apr, 2006 38 commits
  2. 10 Apr, 2006 2 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 30d41bfb
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] 3473/1: Use numbers 0-15 for the VFP double registers
        [ARM] 3472/1: Use the D variants of FLDMIA/FSTMIA on ARMv6
        [ARM] 3471/1: FTOSI functions should return 0 for NaN
        [ARM] 3470/1: Clear the HWCAP bits for the disabled kernel features
        [ARM] 3469/1: S3C24XX: clkout missing hclk selector
        [ARM] 3468/1: S3C2410: SMDK common include fix
        [ARM] 3461/1: ARM: OMAP: Fix clk_get() when using id and name
        [ARM] 3460/1: ARM: OMAP: Remove unnecessary nop_release()
        [ARM] 3459/1: ixp23xx: fix debug serial macros for big-endian operation
        [ARM] Allow decompressor to be built with -ffunction-sections
        [ARM] Fix SA110/SA1100 cache flushing
        [ARM] ebsa110: Fix incorrect serial port address
        [ARM] Fix ebsa110 debug macros
        [ARM] Move FLUSH_BASE macros to asm/arch/memory.h
        [ARM] Remove unnecessary extra parens in include/asm-arm/memory.h
        [ARM] arm's arch_local_page_offset() fix against 2.6.17-rc1
      30d41bfb
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2 · e38d5578
      Linus Torvalds authored
      * 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2:
        [PATCH] CONFIGFS_FS must depend on SYSFS
        [PATCH] Bogus NULL pointer check in fs/configfs/dir.c
        ocfs2: Better I/O error handling in heartbeat
        ocfs2: test and set teardown flag early in user_dlm_destroy_lock()
        ocfs2: Handle the DLM_CANCELGRANT case in user_unlock_ast()
        ocfs2: catch an invalid ast case in dlmfs
        ocfs2: remove an overly aggressive BUG() in dlmfs
        ocfs2: multi node truncate fix
      e38d5578