diff options
| author | Linus Torvalds | 2009-03-30 10:02:36 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2009-03-30 10:02:36 -0700 |
| commit | ffd14285142cb398b2b613e27f71be415d28072e (patch) | |
| tree | 32ffd364a8ee1e69d27ec058a3d710551d24a057 /drivers/ide/ide-floppy.c | |
| parent | 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (diff) | |
| parent | c68a65da35906b32505bbb8eecab316e6736e28b (diff) | |
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: needs crc32_le
jfs: Fix error handling in metapage_writepage()
jfs: return f_fsid for statfs(2)
jfs: remove xtLookupList()
jfs: clean up a dangling comment
Diffstat (limited to 'drivers/ide/ide-floppy.c')
0 files changed, 0 insertions, 0 deletions