summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-30 16:22:38 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-30 16:22:38 +0200
commitbe3fd3cc7c2142c46d5dcfec05e6031990d1f2ca (patch)
tree606074b5c60ef823ad86174e408904c563eab38d /fs
parentMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentx86: Do not free zero sized per cpu areas (diff)
downloadlinux-be3fd3cc7c2142c46d5dcfec05e6031990d1f2ca.tar.xz
linux-be3fd3cc7c2142c46d5dcfec05e6031990d1f2ca.zip
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Do not free zero sized per cpu areas x86: Make sure free_init_pages() frees pages on page boundary x86: Make smp_locks end with page alignment
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions