aboutsummaryrefslogtreecommitdiff
path: root/fs/ecryptfs/main.c
diff options
context:
space:
mode:
authorLinus Torvalds2011-09-07 07:46:48 -0700
committerLinus Torvalds2011-09-07 07:46:48 -0700
commit115452675361dbef2dfb59f4cbd922637be3dc5b (patch)
tree693b1e1f3526d5b4d0881c786726b71934aa3dcc /fs/ecryptfs/main.c
parent768b56f598694ed7215723d402ca3b388106b042 (diff)
parented467e69f16e6b480e2face7bc5963834d025f91 (diff)
Merge branch 'stable/bug.fixes' of git://oss.oracle.com/git/kwilk/xen
* 'stable/bug.fixes' of git://oss.oracle.com/git/kwilk/xen: xen/smp: Warn user why they keel over - nosmp or noapic and what to use instead. xen: x86_32: do not enable iterrupts when returning from exception in interrupt context xen: use maximum reservation to limit amount of usable RAM
Diffstat (limited to 'fs/ecryptfs/main.c')
0 files changed, 0 insertions, 0 deletions