diff options
| author | Jon Medhurst <tixy@linaro.org> | 2016-07-05 09:18:42 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2016-07-05 09:18:42 +0100 |
| commit | 04e565da521b7940bbbe69ef932010be3a66e97a (patch) | |
| tree | 8dc05727dfb9dab6001caac091f0fddbbd42956d /drivers/ps3/ps3av.c | |
| parent | 6bb08f14f504411090a5839e868edd6dc6eb35ae (diff) | |
| parent | f52bb9a62a56ef8287ccde763ca742093be41482 (diff) | |
Merge branch 'lsk-3.18-armlt-mali' into lsk-3.18-armltlsk-3.18-armlt-20160705
Conflicts:
arch/arm64/boot/dts/arm/juno-base.dtsi
linaro/configs/vexpress64.conf
Diffstat (limited to 'drivers/ps3/ps3av.c')
0 files changed, 0 insertions, 0 deletions