diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 22:33:01 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 22:33:01 +0100 |
commit | 2874b391bd78a5b8cb84be67297a345fbdec4ac8 (patch) | |
tree | 5ba53c1207b14c6353e25faec0a58fad567a8558 /drivers/video/console/fbcon.h | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 (diff) | |
parent | 9p: implement optional loose read cache (diff) | |
download | linux-2874b391bd78a5b8cb84be67297a345fbdec4ac8.tar.xz linux-2874b391bd78a5b8cb84be67297a345fbdec4ac8.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: implement optional loose read cache
9p: Use kthread_stop instead of sending a SIGKILL.
Diffstat (limited to 'drivers/video/console/fbcon.h')
0 files changed, 0 insertions, 0 deletions