summaryrefslogtreecommitdiff
path: root/kernel/trace/trace_export.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-05 20:49:57 (GMT)
committerThomas Gleixner <tglx@linutronix.de>2011-02-05 20:50:05 (GMT)
commit285c1a2c3a5f84ce1c811ab4cb1f8a17466e1a06 (patch)
tree7eb4aeab927a25b6cc82aef21ffd5a4f4866ae4b /kernel/trace/trace_export.c
parent1fb0ef31f428f345a7c3666f8e7444a563edd537 (diff)
parenta9fe8d5fd52ecd17c3f3970bbcf6b3573f831898 (diff)
downloadlinux-fsl-qoriq-285c1a2c3a5f84ce1c811ab4cb1f8a17466e1a06.tar.xz
Merge branch 'irq/urgent' into irq/core
Reason: Get mainline fixes integrated. Further patches conflict with them Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/trace/trace_export.c')
0 files changed, 0 insertions, 0 deletions