From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 5 May 2008 00:12:10 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes
X-Git-Tag: v2.6.26-rc2~75
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f74d505;p=linux-2.6

Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes

* 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
---

f74d505b58d36ceeef10e459094f0eb760681165