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


Trivial merge