aboutsummaryrefslogtreecommitdiffstats
path: root/include/trace
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-26 10:02:58 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-26 10:02:58 -0700
commita93a1329271038f0e8337061d3b41b3b212a851e (patch)
treee33d0e6a2959e8aae8a7a9cb03581340010d752c /include/trace
parentMerge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (diff)
parentblock: fix warning with calling smp_processor_id() in preemptible section (diff)
downloadlinux-dev-a93a1329271038f0e8337061d3b41b3b212a851e.tar.xz
linux-dev-a93a1329271038f0e8337061d3b41b3b212a851e.zip
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
* 'for-linus' of git://git.kernel.dk/linux-block: block: fix warning with calling smp_processor_id() in preemptible section
Diffstat (limited to 'include/trace')
0 files changed, 0 insertions, 0 deletions