]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
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)
commitf74d505b58d36ceeef10e459094f0eb760681165
tree94f5cd7bfda9b1e0c4dd4b15d0f902f20b97a717
parent45ea2103d8856454503b30464cc1dba378748d00
parent2961b423037da60a8cb230963ee0d8c04473d73b
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