diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-08 20:12:59 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-08 20:12:59 +0200 |
commit | c8c727db413e18414dc6ebc2cc4f18f390763e17 (patch) | |
tree | a57102fff430d3cb5d2db3a193409850e85047be /drivers/video/carminefb_regs.h | |
parent | Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux (diff) | |
parent | fuse: fix lock annotations (diff) | |
download | linux-c8c727db413e18414dc6ebc2cc4f18f390763e17.tar.xz linux-c8c727db413e18414dc6ebc2cc4f18f390763e17.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
fuse: fix lock annotations
fuse: flush background queue on connection close
Diffstat (limited to 'drivers/video/carminefb_regs.h')
0 files changed, 0 insertions, 0 deletions