diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-20 10:32:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-20 10:32:33 -0800 |
| commit | 88dcb91177cfa5b26143a29074389a2aa259c7cf (patch) | |
| tree | 4906b9712a797b5805aa00fc0f766b27b7432005 /arch/sparc64/kernel/pci_schizo.c | |
| parent | c7cace6437b2f8bbab5ef05b465738283a9a100a (diff) | |
| parent | c5111f504d2a9b0d258d7c4752b4093523315989 (diff) | |
| download | linux-88dcb91177cfa5b26143a29074389a2aa259c7cf.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: JFS: add uid, gid, and umask mount options JFS: Take logsync lock before testing mp->lsn JFS: kzalloc conversion JFS: Add missing file from fa3241d24cf1182b0ffb6e4d412c3bc2a2ab7bf6 JFS: Use the kthread_ API JFS: Fix regression. fsck complains if symlinks do not have INLINEEA attribute JFS: ext2 inode attributes for jfs JFS: semaphore to mutex conversion. JFS: make buddy table static JFS: Add back directory i_size calculations for legacy partitions
Diffstat (limited to 'arch/sparc64/kernel/pci_schizo.c')
0 files changed, 0 insertions, 0 deletions