diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-29 03:41:55 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-29 03:41:55 (GMT) |
commit | dfad53d48e32cd0e10eab98e986c76cdd957600f (patch) | |
tree | f0ccb6ab5c2bee90fe6cb9d9b6b5434ed6ee482d /fs/posix_acl.c | |
parent | 79dba2eaa771c3173957eccfd288e0e0d12e4d3f (diff) | |
parent | 7a0fc404ae663776e96db43879a0fa24fec1fa3a (diff) | |
download | linux-dfad53d48e32cd0e10eab98e986c76cdd957600f.tar.xz |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:
x86: Disable large pages on CPUs with Atom erratum AAE44
x86-64: Clear a 64-bit FS/GS base on fork if selector is nonzero
x86, mrst: Conditionally register cpu hotplug notifier for apbt
Diffstat (limited to 'fs/posix_acl.c')
0 files changed, 0 insertions, 0 deletions