From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Sun, 17 Apr 2005 21:47:24 +0000 (-0700)
Subject: Merge with master.kernel.org:/home/rmk/linux-2.6-rmk.git - ARM changes
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a4e884a311893b476893739901bed382cd62b4fe;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Merge ... /home/rmk/linux-2.6-rmk.git - ARM changes

First ever true git merge. Let's see if it actually works.
---

a4e884a311893b476893739901bed382cd62b4fe