summaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs/file.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-18 12:13:02 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-18 12:13:02 -0700
commit97405fe26b2a4df7090884b086ee8224ace2a6d1 (patch)
tree528f9f1f3f8cf0ce933a366f137faaf55ab89079 /fs/ecryptfs/file.c
parenta10d9a71bafd3a283da240d2868e71346d2aef6f (diff)
parent3fbc54165d7217abf62b871c0dd074e76ce0eb31 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup: [PATCH] x86: do not recompile boot for each build [x86 setup] Save/restore DS around invocations of INT 10h [x86 setup] VGA: Clear the Protect bit before setting the vertical height [x86 setup] Fix assembly constraints [x86 setup] build/tools.c: fix comment [x86 setup] MAINTAINERS: document x86 setup code git tree
Diffstat (limited to 'fs/ecryptfs/file.c')
0 files changed, 0 insertions, 0 deletions