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