summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-07-19 19:28:11 (GMT)
committerPaul Mundt <lethal@linux-sh.org>2009-07-19 19:28:11 (GMT)
commitc358fc46efa6b8a03cf007e7250b4b0020950d0a (patch)
treeeb90f5106d3e152fdccbdd76c48fbb19f5f429a6 /drivers
parent72849873cdf213b5d7b8ae006e6740b2d78f6ad8 (diff)
parent2094e504a7489a2d774d544592360e578d9325f8 (diff)
parent719a72b7c75bb239ca6184190ab994b71a31c6dc (diff)
downloadlinux-fsl-qoriq-c358fc46efa6b8a03cf007e7250b4b0020950d0a.tar.xz
Merge branches 'sh/hwblk' and 'sh/platform-updates'