Merge by hand (conflicts between pending drivers and kfree cleanups)
[cascardo/linux.git] / include / asm-um / local.h
1 #ifndef __UM_LOCAL_H
2 #define __UM_LOCAL_H
3
4 #include "asm/arch/local.h"
5
6 #endif