diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-09 04:44:16 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-09 04:44:16 +0200 |
| commit | 845a2fdcbd5bc5b9f652201ee95c825827a1d521 (patch) | |
| tree | c7dec1efdb7900c4e10331fbab2add44ade5e1bc /drivers/ata/pata_isapnp.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne... (diff) | |
| parent | ocfs2: Fix invalid assertion during write on 64k pages (diff) | |
| download | linux-845a2fdcbd5bc5b9f652201ee95c825827a1d521.tar.xz linux-845a2fdcbd5bc5b9f652201ee95c825827a1d521.zip | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: Fix invalid assertion during write on 64k pages
ocfs2: Fix masklog breakage
Diffstat (limited to 'drivers/ata/pata_isapnp.c')
0 files changed, 0 insertions, 0 deletions