From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 May 2008 16:07:56 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes
X-Git-Tag: v2.6.26-rc3~130
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2b753a1599a28612851a2908abdbf86802c989c5;p=linux-2.6-omap-h63xx.git

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:
  types: s390: fix #ifdef reversal in <asm-s390/types.h>
---

2b753a1599a28612851a2908abdbf86802c989c5