]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 499ee07 18282b3)
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)
* '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.


Trivial merge
Clone of davem's net-next-2.6 tree