diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-09-28 08:50:09 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-09-28 08:50:09 +0200 |
commit | 62d08aec6a9f4b45cc9cba1e3b2855995df133e6 (patch) | |
tree | 51bddd857fb0eb03cd16c9ae17369e81b8f970f4 /init/initramfs.c | |
parent | Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
parent | arm: Fix build error with context tracking calls (diff) | |
download | linux-62d08aec6a9f4b45cc9cba1e3b2855995df133e6.tar.xz linux-62d08aec6a9f4b45cc9cba1e3b2855995df133e6.zip |
Merge branch 'context_tracking/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into sched/urgent
Pull context tracking ARM fix from Frederic Weisbecker.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'init/initramfs.c')
0 files changed, 0 insertions, 0 deletions