diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-01-13 13:35:28 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-01-13 13:35:28 +0100 |
commit | 56b4811039174bba9cbd68318d0d8b1585b9eded (patch) | |
tree | f3e8f99e85e545662d82e18bef2a7009c2948852 /kernel/.gitignore | |
parent | sched/numa: Fix period_slot recalculation (diff) | |
parent | sched: Calculate effective load even if local weight is 0 (diff) | |
download | linux-56b4811039174bba9cbd68318d0d8b1585b9eded.tar.xz linux-56b4811039174bba9cbd68318d0d8b1585b9eded.zip |
Merge branch 'sched/urgent' into sched/core
Pick up the latest fixes before applying new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/.gitignore')
-rw-r--r-- | kernel/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/.gitignore b/kernel/.gitignore index b3097bde4e9c..790d83c7d160 100644 --- a/kernel/.gitignore +++ b/kernel/.gitignore @@ -5,3 +5,4 @@ config_data.h config_data.gz timeconst.h hz.bc +x509_certificate_list |