| commit | 53a4998229efbf5cb79ec7ca7c18f4c86f66755d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Jul 21 12:03:57 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Jul 21 12:03:57 2006 -0700 |
| tree | e6c9be05fe944b70fa4ede3849a55b273ec068bd | |
| parent | 3bda2418b94243d5e43fcfe48d9de70cb0d2423e [diff] | |
| parent | d7cf0d57ef9e07cf0f65c58c19a8e7c4a9db72b5 [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] 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.