]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 162350e 5e7184a)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...
authorPierre Ossman <drzeus@drzeus.cx>
Sun, 12 Oct 2008 09:08:46 +0000 (11:08 +0200)
committerPierre Ossman <drzeus@drzeus.cx>
Sun, 12 Oct 2008 09:08:46 +0000 (11:08 +0200)
Conflicts:
drivers/mmc/host/atmel-mci.c

1  2 
drivers/mmc/host/Kconfig patch | diff1 | diff2 | blob | history

diff --cc drivers/mmc/host/Kconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.