summaryrefslogtreecommitdiffstats
path: root/fs/exofs/exofs.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-12 07:52:48 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-12 07:52:48 +0100
commitb8bf17d311c875de02550d5ce2af66588734159a (patch)
tree82d829df77f3eb506d10928fd633a8a6e5685082 /fs/exofs/exofs.h
parentMerge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff)
parentsched: Fix lockup by limiting load-balance retries on lock-break (diff)
downloadlinux-b8bf17d311c875de02550d5ce2af66588734159a.tar.xz
linux-b8bf17d311c875de02550d5ce2af66588734159a.zip
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched: Fix lockup by limiting load-balance retries on lock-break sched: Fix CONFIG_CGROUP_SCHED dependency sched: Remove empty #ifdefs
Diffstat (limited to 'fs/exofs/exofs.h')
0 files changed, 0 insertions, 0 deletions