From: Pierre Ossman 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-Tag: Ubuntu-5.10.0-12.13~36510^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6ee6c6adf1cfebbf432b8d1f204c7f96e395933e;p=mirror_ubuntu-hirsute-kernel.git Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/atmel-mci-2.6.28 Conflicts: drivers/mmc/host/atmel-mci.c --- 6ee6c6adf1cfebbf432b8d1f204c7f96e395933e