From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Jul 2009 18:15:00 +0000 (-0700)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/fyu/linux-2.6
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a1cc1ba7aec1ba41317d227b1fe8d0f8c0cec232;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'release' of git://git./linux/kernel/git/fyu/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/fyu/linux-2.6:
  Revert "Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h"
  Add dma_debug_init() for ia64
  Fix ia64 compilation IS_ERR and PTE_ERR errors.
---

a1cc1ba7aec1ba41317d227b1fe8d0f8c0cec232