summaryrefslogtreecommitdiff
path: root/include/linux/cpuidle.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-08-05 07:46:29 (GMT)
committerIngo Molnar <mingo@elte.hu>2010-08-05 07:46:29 (GMT)
commit0bcfe75807944106a3aa655a54bb610d62f3a7f5 (patch)
treed48d848e09d1bf48fe7fa23e9226f38ef342eed4 /include/linux/cpuidle.h
parenteebef74695e1498e04e5f85be9c6f84bd2e7358a (diff)
parent396e894d289d69bacf5acd983c97cd6e21a14c08 (diff)
downloadlinux-fsl-qoriq-0bcfe75807944106a3aa655a54bb610d62f3a7f5.tar.xz
Merge branch 'sched/urgent' into sched/core
Conflicts: include/linux/sched.h Merge reason: Add the leftover .35 urgent bits, fix the conflict. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/cpuidle.h')
0 files changed, 0 insertions, 0 deletions