Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 21 May 2007 17:01:36 +0000 (10:01 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 21 May 2007 17:01:36 +0000 (10:01 -0700)
commit4b85df0419d1fb135d9d845876e8c7ee1393f83c
tree9630646aa3bca16e9266d79121b479f747d3677c
parent6044ab324ce4c180bce17aa9be00157c611d7d48
parentbe2864b5ee46e0d5ed626de6cbfeb9abbd9c2e6f
Merge branch 'for-linus' of git://git390.osdl.marist.edu/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] More verbose show_mem() like other architectures.
  [S390] Make use of kretprobe_assert.
  [S390] Wire up signald, timerfd and eventfd syscalls.
  [S390] Wire up sys_utimensat.
  [S390] cio: Update documentation.