diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-27 16:47:55 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-27 16:47:55 -0700 |
commit | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (patch) | |
tree | 796a66c7ad29ae1d2d60133fdcd7167a513fac49 /include/asm-cris/dma-mapping.h | |
parent | fb4284b2b7cfaf3b89557667587cca90bddccc59 (diff) | |
parent | 744d18dbfae07482ea461701b0aaec3a75ec9224 (diff) |
Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
NFS: Ensure we call nfs_sb_deactive() after releasing the directory inode
nfs_remount oops when rebooting + possible fix
Diffstat (limited to 'include/asm-cris/dma-mapping.h')
0 files changed, 0 insertions, 0 deletions