From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Mar 2010 23:57:24 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=722874465e3cd3268387b96e02220f84b35a8d98;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (27 commits)
  microblaze: entry.S use delay slot for return handlers
  microblaze: Save current task directly
  microblaze: Simplify entry.S - save/restore r3/r4 - ret_from_trap
  microblaze: PCI early support for noMMU system
  microblaze: Fix dma alloc and free coherent dma functions
  microblaze: Add consistent code
  microblaze: pgtable.h: move consistent functions
  microblaze: Remove ancient Kconfig option for consistent mapping
  microblaze: Remove VMALLOC_VMADDR
  microblaze: Add define for ASM_LOOP
  microblaze: Preliminary support for dma drivers
  microblaze: remove trailing space in messages
  microblaze: Use generic show_mem()
  microblaze: Change temp register for cmdline
  microblaze: Preliminary support for dma drivers
  microblaze: Move cache function to cache.c
  microblaze: Add support from PREEMPT
  microblaze: Add support for Xilinx PCI host bridge
  microblaze: Enable PCI, missing files
  microblaze: Add core PCI files
  ...
---

722874465e3cd3268387b96e02220f84b35a8d98