Merge commit 'v2.6.30-rc1' into sched/urgent
[linux-2.6] / arch / um / include / asm / ftrace.h
1 /* empty */