summaryrefslogtreecommitdiff
path: root/Documentation/blockdev/cciss.txt
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-12-12 16:09:22 -0800
committerOlof Johansson <olof@lixom.net>2012-12-12 16:10:00 -0800
commit4a76411ea3f1da9032e031f8fff8894b97d141b2 (patch)
tree59976175d70b6e08aacd4abf7090919d3b78fc29 /Documentation/blockdev/cciss.txt
parent5c1af2a7011bf719807de360cb64c2f610269a38 (diff)
parentfb6842a7bc44bf719bfe85d5819a153d7c215510 (diff)
ARM: arm-soc: Merge branch 'next/clk' into next/pm
Merge together a couple of the smaller pm/clock branches into one. Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/blockdev/cciss.txt')
0 files changed, 0 insertions, 0 deletions