diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-21 21:03:57 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-21 21:03:57 +0200 |
commit | 53a4998229efbf5cb79ec7ca7c18f4c86f66755d (patch) | |
tree | e6c9be05fe944b70fa4ede3849a55b273ec068bd /fs/udf/file.c | |
parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
parent | [S390] sysfs_create_xxx return values. (diff) | |
download | linux-53a4998229efbf5cb79ec7ca7c18f4c86f66755d.tar.xz linux-53a4998229efbf5cb79ec7ca7c18f4c86f66755d.zip |
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.
Diffstat (limited to 'fs/udf/file.c')
0 files changed, 0 insertions, 0 deletions