diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 10:01:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 10:01:36 -0700 |
| commit | 4b85df0419d1fb135d9d845876e8c7ee1393f83c (patch) | |
| tree | 9630646aa3bca16e9266d79121b479f747d3677c /net/dccp/minisocks.c | |
| parent | 6044ab324ce4c180bce17aa9be00157c611d7d48 (diff) | |
| parent | be2864b5ee46e0d5ed626de6cbfeb9abbd9c2e6f (diff) | |
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] 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.
Diffstat (limited to 'net/dccp/minisocks.c')
0 files changed, 0 insertions, 0 deletions