From: Paul Mackerras <paulus@samba.org>
Date: Wed, 3 Dec 2008 09:11:06 +0000 (+1100)
Subject: Merge branch 'merge'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=527491885554002837b5742202adc0ab5f536e54;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'merge'
---

527491885554002837b5742202adc0ab5f536e54