Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 May 2008 00:12:10 +0000 (17:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 May 2008 00:12:10 +0000 (17:12 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes:
  fix asm-mips/types.h syntax error
  fix asm-alpha/types.h breakage


Trivial merge