diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-27 13:54:43 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-27 13:54:43 -0700 |
commit | 72e19b3b22f43b20ee84db0deba33c71803cbe34 (patch) | |
tree | 2ca2ad35d0f01b0a808991ca3749060f8c382b24 /fs/ocfs2/aops.h | |
parent | f42ac38c59e0a03d6da0c24a63fb211393f484b0 (diff) | |
parent | dbe13d9981e55c60a030d0509acc9a8968b9c5bf (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] dcss: fix build bug.
[S390] Fix linker script.
Diffstat (limited to 'fs/ocfs2/aops.h')
0 files changed, 0 insertions, 0 deletions