diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-11-16 10:16:28 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-11-16 10:16:28 +0100 |
commit | 0acbc7aa4713b450ff46f9c9f6ce0060ea6947b1 (patch) | |
tree | 480508a78b7d9e9c0da0ffbd33b40e0b4e076a16 /drivers/block/amiflop.c | |
parent | sched/cputime: Simplify task_cputime() (diff) | |
parent | Merge tag 'trace-v4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/r... (diff) | |
download | linux-0acbc7aa4713b450ff46f9c9f6ce0060ea6947b1.tar.xz linux-0acbc7aa4713b450ff46f9c9f6ce0060ea6947b1.zip |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/block/amiflop.c')
0 files changed, 0 insertions, 0 deletions