Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/fyu/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Jul 2009 18:15:00 +0000 (11:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Jul 2009 18:15:00 +0000 (11:15 -0700)
commita1cc1ba7aec1ba41317d227b1fe8d0f8c0cec232
treead9ed53d30b54141d99a67c90eefdd3a4a0d83dc
parent499ee0710f9881423d807c6ecc451c5e1bd5ff62
parent18282b36d742347abd9a4bc74fe9fd2432a8335b
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.