aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/osl.c
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-21 19:36:11 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-21 19:36:11 +0100
commit263ebaa17349cabffd1ead85f4bf0e0f515938bd (patch)
tree445aadf76dce4b88d1ad58e9b153b7737b210b33 /drivers/acpi/osl.c
parentc59f723a562f9539dfac68c1b306858e35a05cdd (diff)
parent008e15d4745c3a359ee01ed76529dee2366bac10 (diff)
downloadkernel_samsung_smdk4412-263ebaa17349cabffd1ead85f4bf0e0f515938bd.zip
kernel_samsung_smdk4412-263ebaa17349cabffd1ead85f4bf0e0f515938bd.tar.gz
kernel_samsung_smdk4412-263ebaa17349cabffd1ead85f4bf0e0f515938bd.tar.bz2
Merge remote-tracking branch 'cyanogen/cm-13.0' into replicant-6.0
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> Conflicts: arch/arm/lib/getuser.S arch/arm/lib/putuser.S
Diffstat (limited to 'drivers/acpi/osl.c')
0 files changed, 0 insertions, 0 deletions