1. 30 3月, 2006 2 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 76babde1
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (67 commits)
        [PATCH] powerpc: Remove oprofile spinlock backtrace code
        [PATCH] powerpc: Add oprofile calltrace support to all powerpc cpus
        [PATCH] powerpc: Add oprofile calltrace support
        [PATCH] for_each_possible_cpu: ppc
        [PATCH] for_each_possible_cpu: powerpc
        [PATCH] lock PTE before updating it in 440/BookE page fault handler
        [PATCH] powerpc: Kill _machine and hard-coded platform numbers
        ppc: Fix compile error in arch/ppc/lib/strcase.c
        [PATCH] git-powerpc: WARN was a dumb idea
        [PATCH] powerpc: a couple of trivial compile warning fixes
        powerpc: remove OCP references
        powerpc: Make uImage default build output for MPC8540 ADS
        powerpc: move math-emu over to arch/powerpc
        powerpc: use memparse() for mem= command line parsing
        ppc: fix strncasecmp prototype
        [PATCH] powerpc: make ISA floppies work again
        [PATCH] powerpc: Fix some initcall return values
        [PATCH] powerpc: Workaround for pSeries RTAS bug
        [PATCH] spufs: fix __init/__exit annotations
        [PATCH] powerpc: add hvc backend for rtas
        ...
      76babde1
    • L
      Merge git://oss.sgi.com:8090/oss/git/xfs-2.6 · e71ac603
      Linus Torvalds 提交于
      * git://oss.sgi.com:8090/oss/git/xfs-2.6:
        [XFS] Cleanup in XFS after recent get_block_t interface tweaks.
        [XFS] Remove unused/obsoleted function: xfs_bmap_do_search_extents()
        [XFS] A change to inode chunk allocation to try allocating the new chunk
        Fixes a regression from the recent "remove ->get_blocks() support"
        [XFS] Fix compiler warning and small code inconsistencies in compat
        [XFS] We really suck at spulling.  Thanks to Chris Pascoe for fixing all
      e71ac603
  2. 29 3月, 2006 38 次提交