]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mmc/mmc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 02:44:18 +0000 (12:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 02:44:21 +0000 (12:44 +1000)
commit1157d7f1f1160d64ec6c62ade0ab6e8ed9e76011
treeeb8885238f3f5e73fac0ad723af5e5cb7ae5dcfb
parent735218cfc89da07a695bb8c8b6d879880a9ae93d
parent06732b84b4cf0372f2c1db368c7b4767b020c2d1
Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
include/linux/omap-dma.h
MAINTAINERS
drivers/mmc/host/rtsx_pci_sdmmc.c
include/linux/omap-dmaengine.h