summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/uapi/asm/ps3fb.h
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-02 17:08:08 +0100
committerMark Brown <broonie@linaro.org>2014-06-02 17:08:08 +0100
commit4c04ef25b8aae6b5a8c4cc5c0235fc5d239209fd (patch)
treeca0f339a7ec280f8446b9061240c2c5a3761bfa1 /arch/powerpc/include/uapi/asm/ps3fb.h
parent2c7a6a354794714da8aeaea0cf8fd162feb4a7a1 (diff)
parentdbabd624d4eec50b623bab070d1e39a854b2d65c (diff)
parent0ee42bb1f88d1bccdb140f37ec2fc4db6684a4ff (diff)
parentab3ca774a2b78e7b8c09a75b634fb872b96e675c (diff)
parent0608032a9067c165e5ed75c56311a08cbb28564f (diff)
parentb203e0dfe1a2b0ae5e2681e9285056e4ae8560af (diff)
Merge remote-tracking branches 'regulator/topic/palmas', 'regulator/topic/pbias', 'regulator/topic/pfuze100', 'regulator/topic/s2mpa01' and 'regulator/topic/s2mps11' into regulator-next