diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-29 23:35:01 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-29 23:35:01 -0400 |
| commit | 6ffc1fee98c4b995eb3a0285f4f8fb467cb0306e (patch) | |
| tree | 69a05892a41e7f7400fa598ee0bdf8027c8f0fd6 /block/blk.h | |
| parent | e40152ee1e1c7a63f4777791863215e3faa37a86 (diff) | |
| parent | 7c1ff4c544dd650cceff3cd69a04bcba60856678 (diff) | |
Merge branch 'master' into wip-merge-2.6.34
Simple merge between master and 2.6.34 with conflicts resolved.
This commit does not compile, the following main problems are still
unresolved:
- spinlock -> raw_spinlock API changes
- kfifo API changes
- sched_class API changes
Conflicts:
Makefile
arch/x86/include/asm/hw_irq.h
arch/x86/include/asm/unistd_32.h
arch/x86/kernel/syscall_table_32.S
include/linux/hrtimer.h
kernel/sched.c
kernel/sched_fair.c
Diffstat (limited to 'block/blk.h')
0 files changed, 0 insertions, 0 deletions