summaryrefslogtreecommitdiffstats
path: root/kernel/power/disk.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-18 12:05:53 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-18 12:05:53 -0800
commit59da1f87b276c593b852766c2fdcad62835970f7 (patch)
tree3c3ace81c2132aaf13223df10c4491c38a46c976 /kernel/power/disk.c
parent69098bac169d630a777b362470f20451b9446e39 (diff)
parenta06d568f7c5e40e34ea64881842deb8f4382babf (diff)
downloadlinux-59da1f87b276c593b852766c2fdcad62835970f7.tar.gz
linux-59da1f87b276c593b852766c2fdcad62835970f7.tar.bz2
linux-59da1f87b276c593b852766c2fdcad62835970f7.zip
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: async_xor: dma_map destination DMA_BIDIRECTIONAL dmaengine: protect 'id' from concurrent registrations ioat: wait for self-test completion
Diffstat (limited to 'kernel/power/disk.c')
0 files changed, 0 insertions, 0 deletions