tree 896164b6d9835bdc7a1b1900e614d7eb0bd43ba8
parent 8d97b84935b28ed8944d1be31859a3df7ebe93ae
parent 2ccdcfeeca6a1888180ffc4a1ab097f1fb2bd029
author Linus Torvalds <torvalds@linux-foundation.org> 1210608476 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1210608476 -0700

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>