summaryrefslogtreecommitdiffstats
path: root/drivers/zorro
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-13 00:20:24 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-13 00:20:24 +0200
commit9b1ef1de20e2658c77cce89941f45525704ab534 (patch)
tree9ae887c34496c6a8be6ea3e5eaa41cd52e743588 /drivers/zorro
parentMerge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff)
parentperf tools: Fix getrusage() related build failure on glibc trunk (diff)
downloadlinux-9b1ef1de20e2658c77cce89941f45525704ab534.tar.xz
linux-9b1ef1de20e2658c77cce89941f45525704ab534.zip
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull trivial perf build failure fix from Thomas Gleixner. * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf tools: Fix getrusage() related build failure on glibc trunk
Diffstat (limited to 'drivers/zorro')
0 files changed, 0 insertions, 0 deletions