diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2013-01-10 16:21:07 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2013-01-10 16:21:07 -0500 |
| commit | 8d00682ce5ddaedfb62287773d21c727f08fda69 (patch) | |
| tree | 61a4b7bac5960c6f0ab25fe087404e9ca1725e05 /include/linux/keyctl.h | |
| parent | fdf0a6b73001976c5d02d631ebdd0927819d7c91 (diff) | |
| parent | 1235a665a5e00dc762e6646c01381b3ed5019d86 (diff) | |
Merge branch 'wip-gpu-cleanup' into wip-2012.3-gpu
Conflicts:
include/litmus/fpmath.h
include/litmus/litmus.h
include/litmus/rt_param.h
include/litmus/trace.h
kernel/sched.c
kernel/softirq.c
litmus/edf_common.c
litmus/jobs.c
litmus/litmus.c
litmus/locking.c
litmus/preempt.c
litmus/sched_cedf.c
litmus/sched_gsn_edf.c
litmus/sched_litmus.c
litmus/sync.c
Diffstat (limited to 'include/linux/keyctl.h')
0 files changed, 0 insertions, 0 deletions