]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitbab05160e163987a43262d292c492daf6bae8f45
treecf8f017f44b768445eecb6698c47d479c6b46a01
parent22d88aae602314d215aa8944cf075e2c026d6b4b
parentc7361a0df65a929cdb0c774ece7cb4b601047dec
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
drivers/mmc/host/Kconfig