Merge branch 'for-linus' of git://github.com/richardweinberger/linux
[pandora-kernel.git] / kernel / trace / trace.c
Simple merge