diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-11-06 07:50:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-11-06 07:50:37 +0100 |
| commit | c90423d1de12fbeaf0c898e1db0e962de347302b (patch) | |
| tree | 8c7a32b37e74155324ae2b556fcc42718ccf29a3 /fs/jffs2/xattr.c | |
| parent | Merge branch 'core/rcu' into core/locking, to prepare the kernel/locking/ fil... (diff) | |
| parent | sched: Move completion code from core.c to completion.c (diff) | |
| download | linux-c90423d1de12fbeaf0c898e1db0e962de347302b.tar.xz linux-c90423d1de12fbeaf0c898e1db0e962de347302b.zip | |
Merge branch 'sched/core' into core/locking, to prepare the kernel/locking/ file move
Conflicts:
kernel/Makefile
There are conflicts in kernel/Makefile due to file moving in the
scheduler tree - resolve them.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/jffs2/xattr.c')
0 files changed, 0 insertions, 0 deletions