From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 12 Jul 2006 15:30:57 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
X-Git-Tag: v2.6.18-rc2~112
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b2d6744849b5bf6b4593b81c136772df7a238ac9;p=linux-2.6-omap-h63xx.git

Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] Fix sparse warnings.
  [S390] path grouping and path verifications fixes.
  [S390] xpram module parameter parsing.
  [S390] cpu_relax() is supposed to have barrier() semantics.
  [S390] fix futex_atomic_cmpxchg_inatomic
  [S390] subchannel register/unregister mutex.
  [S390] raw_local_save_flags/raw_local_irq_restore type check
  [S390] __builtin_trap() and gcc version.
---

b2d6744849b5bf6b4593b81c136772df7a238ac9