Merge branch 'topic/oxygen' into to-push
[linux-2.6] / arch / arm / include / asm / local.h
1 #include <asm-generic/local.h>