diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 13:25:59 +0200 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 13:25:59 +0200 |
| commit | 206a1a825dc67060ee319c99569755ba11250907 (patch) | |
| tree | e4cdbd7b8b745e0ad4adfd59fa57c3bcabe3daf4 /kernel/rtmutex.h | |
| parent | ARM: Merge for-2635-4/watchdog (diff) | |
| parent | ARM: SAMSUNG: Add platform support code for OneNAND controller (diff) | |
| download | linux-206a1a825dc67060ee319c99569755ba11250907.tar.xz linux-206a1a825dc67060ee319c99569755ba11250907.zip | |
ARM: Merge for-2635-4/onenand
Merge branch 'for-2635-4/onenand' into for-2635-4/partial2
Conflicts:
arch/arm/mach-s5pc100/cpu.c
arch/arm/mach-s5pc100/include/mach/map.h
arch/arm/mach-s5pv210/Makefile
Diffstat (limited to 'kernel/rtmutex.h')
0 files changed, 0 insertions, 0 deletions