summaryrefslogtreecommitdiff
path: root/drivers/staging/rts_pstor/sd.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-13 10:45:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-13 10:45:49 -0700
commitc78a9b9b8e36b8de302eddbe7a1688af3d9650ff (patch)
tree3857996cf30ae6a60b5afe2e1e3e30f75fbca05e /drivers/staging/rts_pstor/sd.c
parent842c895d140a75e5d67fa346213deb3ca2b460f8 (diff)
parent5f127133ee432d0b83ee26e8e3a3d7828ab5f2b1 (diff)
downloadlinux-3.10-c78a9b9b8e36b8de302eddbe7a1688af3d9650ff.tar.gz
linux-3.10-c78a9b9b8e36b8de302eddbe7a1688af3d9650ff.tar.bz2
linux-3.10-c78a9b9b8e36b8de302eddbe7a1688af3d9650ff.zip
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: ftrace: Revert 8ab2b7efd ftrace: Remove unnecessary disabling of irqs kprobes/trace: Fix kprobe selftest for gcc 4.6 ftrace: Fix possible undefined return code oprofile, dcookies: Fix possible circular locking dependency oprofile: Fix locking dependency in sync_start() oprofile: Free potentially owned tasks in case of errors oprofile, x86: Add comments to IBS LVT offset initialization
Diffstat (limited to 'drivers/staging/rts_pstor/sd.c')
0 files changed, 0 insertions, 0 deletions