1. 29 Jun, 2006 36 commits
  2. 28 Jun, 2006 4 commits
    • Linus Torvalds's avatar
      Merge branch 'nommu' of master.kernel.org:/home/rmk/linux-2.6-arm · 27d68a36
      Linus Torvalds authored
      * 'nommu' of master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] nommu: backtrace code must not reference a discarded section
        [ARM] nommu: Initial uCLinux support for MMU-based CPUs
        [ARM] nommu: prevent Xscale-based machines being selected
        [ARM] nommu: export flush_dcache_page()
        [ARM] nommu: remove fault-armv, mmap and mm-armv files from nommu build
        [ARM] Remove TABLE_SIZE, and several unused function prototypes
        [ARM] nommu: Provide a simple flush_dcache_page implementation
        [ARM] nommu: add arch/arm/Kconfig-nommu to Kconfig files
        [ARM] nommu: add stubs for ioremap and friends
        [ARM] nommu: avoid selecting TLB and CPU specific copy code
        [ARM] nommu: uaccess tweaks
        [ARM] nommu: adjust headers for !MMU ARM systems
        [ARM] nommu: we need the TLS register emulation for nommu mode
      27d68a36
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · 76a22271
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] 3672/1: PXA: don't probe output GPIOs for interrupt
        [ARM] 3671/1: ep93xx: add cirrus logic edb9315 support
        [ARM] 3370/2: ep93xx: add crunch support
        [ARM] 3665/1: crunch: add ptrace support
        [ARM] 3664/1: crunch: add signal frame save/restore
        [ARM] 3663/1: fix resource->end off-by-one thinko during physmap conversion
        [ARM] 3662/1: ixp23xx: don't include asm/hardware.h in uncompress.h
        [ARM] 3660/1: Remove legacy defines
        [ARM] 3661/1: S3C2412: Fix compilation if CPU_S3C2410 only
        [ARM] 3658/1: S3C244X: Change usb-gadget name to s3c2440-usbgadget
        [ARM] Remove the __arch_* layer from uaccess.h
      76a22271
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · fffcb480
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
        [WATCHDOG] Documentation/watchdog update
        [WATCHDOG] convert AT91RM9200 watchdog to platform driver
        [WATCHDOG] add WDIOC_GETTIMELEFT ioctl
        [WATCHDOG] Pre-Timeout flags
      fffcb480
    • Thomas Gleixner's avatar
      [PATCH] Fix plist include dependency · b4459790
      Thomas Gleixner authored
      plist.h uses container_of, which is defined in kernel.h.
      Include kernel.h in plist.h as the kernel.h include does not longer
      happen automatically on all architectures.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      b4459790