Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 12 May 2008 16:07:56 +0000 (09:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 12 May 2008 16:07:56 +0000 (09:07 -0700)
commit2b753a1599a28612851a2908abdbf86802c989c5
tree896164b6d9835bdc7a1b1900e614d7eb0bd43ba8
parent8d97b84935b28ed8944d1be31859a3df7ebe93ae
parent2ccdcfeeca6a1888180ffc4a1ab097f1fb2bd029
Merge git://git./linux/kernel/git/hpa/linux-2.6-inttypes

* git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes:
  types: s390: fix #ifdef reversal in <asm-s390/types.h>