From: Pierre Ossman <drzeus@drzeus.cx>
Date: Sun, 12 Oct 2008 09:08:46 +0000 (+0200)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6ee6c6adf1cfebbf432b8d1f204c7f96e395933e;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'master' of git://git./linux/kernel/git/hskinnemoen/atmel-mci-2.6.28

Conflicts:
	drivers/mmc/host/atmel-mci.c
---

6ee6c6adf1cfebbf432b8d1f204c7f96e395933e