From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 21 Jul 2006 19:03: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-rc3~77
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=53a4998229efbf5cb79ec7ca7c18f4c86f66755d;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] sysfs_create_xxx return values.
  [S390] .align 4096 statements in head.S
  [S390] get_clock inline assembly.
  [S390] channel measurement interval display.
  [S390] xpram module parameter parsing - take 2.
  [S390] Fix gcc warning about unused return values.
---

53a4998229efbf5cb79ec7ca7c18f4c86f66755d