| commit | a1cc1ba7aec1ba41317d227b1fe8d0f8c0cec232 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 17 11:15:00 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 17 11:15:00 2009 -0700 |
| tree | ad9ed53d30b54141d99a67c90eefdd3a4a0d83dc | |
| parent | 499ee0710f9881423d807c6ecc451c5e1bd5ff62 [diff] | |
| parent | 18282b36d742347abd9a4bc74fe9fd2432a8335b [diff] |
Merge branch 'release' of git://git.kernel.org/pub/scm/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.