1. 09 May, 2006 9 commits
  2. 08 May, 2006 29 commits
  3. 07 May, 2006 2 commits
    • Jan Beulich's avatar
      kbuild: Do not overwrite makefile as anohter user · fd5f0cd6
      Jan Beulich authored
      
      
      Change the conditional of the outputmakefile rule to be evaluated entirely
      in make, and add a conditional to not touch the generated makefile when e.g.
      running 'make install' as root while the build was done as non-root. Also
      adjust the comment describing this, and move the message printing and
      redirection to mkmakefile.
      
      Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      fd5f0cd6
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 9d21f09c
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] 3507/1: Replace map_desc.physical with map_desc.pfn: aaed2000
        [ARM] 3506/1: aaec2000: debug-macro.S needs hardware.h
        [ARM] 3505/1: aaec2000: entry-macro.S needs asm/arch/irqs.h
        [ARM] 3504/1: Fix clcd includes for aaec2000
        [ARM] 3503/1: Fix map_desc structure for aaec2000
        [ARM] 3501/1: i.MX: fix lowlevel debug macros
        [ARM] rtc-sa1100: fix compiler warnings and error cleanup
        [ARM] Allow SA1100 RTC alarm to be configured for wakeup
      9d21f09c