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: v2.6.28-rc1~701^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6ee6c6adf1cfebbf432b8d1f204c7f96e395933e;p=linux-2.6-omap-h63xx.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