diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-21 09:25:41 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-21 09:25:41 -0400 |
| commit | 6e0c5c609ad02f49d7e3e5edc3d65db1e233d857 (patch) | |
| tree | 62517b45689b743e9976721df89634267e165011 /Documentation/filesystems/configfs/configfs_example_macros.c | |
| parent | e40152ee1e1c7a63f4777791863215e3faa37a86 (diff) | |
| parent | 960145eb829ae7a7b2d029e987f99a6be7a78d6b (diff) | |
Merge branch 'master' into wip-2.6.34
Merge LitmusRT master and 2.6.34. This commit is just the plain merge
with conflicts resolved. It won't compile.
Conflicts solved:
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 'Documentation/filesystems/configfs/configfs_example_macros.c')
0 files changed, 0 insertions, 0 deletions