summaryrefslogtreecommitdiffstats
path: root/include/asm-cris/dma.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-09 15:27:54 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-09 15:27:54 -0800
commita70a93229943c177f0062490b4f8e44be4cef685 (patch)
tree24cc6f087307f18cda2f55ad91c7649dd5388b86 /include/asm-cris/dma.h
parenta80b824f0b63fa3a8c269903828beb0837d738e7 (diff)
parente6fe6649b4ec11aa3075e394b4d8743eebe1f64c (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: sched: proper prototype for kernel/sched.c:migration_init() sched: avoid large irq-latencies in smp-balancing sched: fix copy_namespace() <-> sched_fork() dependency in do_fork sched: clean up the wakeup preempt check, #2 sched: clean up the wakeup preempt check sched: wakeup preemption fix sched: remove PREEMPT_RESTRICT sched: turn off PREEMPT_RESTRICT KVM: fix !SMP build error x86: make nmi_cpu_busy() always defined x86: make ipi_handler() always defined sched: cleanup, use NSEC_PER_MSEC and NSEC_PER_SEC sched: reintroduce SMP tunings again sched: restore deterministic CPU accounting on powerpc sched: fix delay accounting regression sched: reintroduce the sched_min_granularity tunable sched: documentation: place_entity() comments sched: fix vslice
Diffstat (limited to 'include/asm-cris/dma.h')
0 files changed, 0 insertions, 0 deletions