diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-05 11:39:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-05 11:39:25 -0800 |
| commit | c11eef21aa119a41fa210b9693f2346997885bcf (patch) | |
| tree | b2d874f4b3f8a65029bc184a2db6b999b8e4d1c1 /include/linux/nfs4.h | |
| parent | 221d46841b931d0e6b11e6251e482f2afe3974dd (diff) | |
| parent | d2cb0e6ecbe0ef93ab36631cd17ec6cf92b69c5a (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] tod clock: announce clocksource as perfect
[S390] Rename "idle_time" attribute to "idle_time_us".
[S390] Fix priority mistakes in drivers/s390/cio/cmf.c
[S390] Fix memory detection.
[S390] Fix compile on !CONFIG_SMP.
[S390] device_schedule_callback() for dcssblk.
[S390] Fix smsgiucv init on no iucv machines
[S390] cio: use INIT_WORK to initialize struct work.
Diffstat (limited to 'include/linux/nfs4.h')
0 files changed, 0 insertions, 0 deletions