summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-04-07 16:21:03 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-04-07 16:21:03 +0900
commit9bc4341eb79d885e5a9dda6384a60bb0f4655fe7 (patch)
tree61a1a997b9ea17d5b147fee015f0214f94e9bb3a /drivers
parent927a7c9c1793def3a55d60c926d3945528e6bf1b (diff)
parentdec710b77c2cf04bf512acada3c14a16f11708d9 (diff)
parent0924fada1e64f92dd89818cf3a15571cc515afd8 (diff)
downloadlinux-3.10-9bc4341eb79d885e5a9dda6384a60bb0f4655fe7.tar.gz
linux-3.10-9bc4341eb79d885e5a9dda6384a60bb0f4655fe7.tar.bz2
linux-3.10-9bc4341eb79d885e5a9dda6384a60bb0f4655fe7.zip
Merge branches 'genesis/dmaengine', 'genesis/intc-extension' and 'genesis/i2c-updates'