Home
last modified time | relevance | path

Searched hist:"265 d9c673d47fcd5812d69dc07104b706285de56" (Results 1 – 7 of 7) sorted by relevance

/openbmc/linux/drivers/dma/sh/
H A Dshdma.hdiff 265d9c673d47fcd5812d69dc07104b706285de56 Mon Sep 02 07:12:35 CDT 2013 Vinod Koul <vinod.koul@intel.com> Merge branch 'topic/sh' into for-linus

Conflicts:
drivers/dma/sh/Kconfig
drivers/dma/sh/shdmac.c

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
H A Dshdmac.cdiff 265d9c673d47fcd5812d69dc07104b706285de56 Mon Sep 02 07:12:35 CDT 2013 Vinod Koul <vinod.koul@intel.com> Merge branch 'topic/sh' into for-linus

Conflicts:
drivers/dma/sh/Kconfig
drivers/dma/sh/shdmac.c

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
H A DKconfigdiff 265d9c673d47fcd5812d69dc07104b706285de56 Mon Sep 02 07:12:35 CDT 2013 Vinod Koul <vinod.koul@intel.com> Merge branch 'topic/sh' into for-linus

Conflicts:
drivers/dma/sh/Kconfig
drivers/dma/sh/shdmac.c

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
H A DMakefilediff 265d9c673d47fcd5812d69dc07104b706285de56 Mon Sep 02 07:12:35 CDT 2013 Vinod Koul <vinod.koul@intel.com> Merge branch 'topic/sh' into for-linus

Conflicts:
drivers/dma/sh/Kconfig
drivers/dma/sh/shdmac.c

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
H A Dshdma-base.cdiff 265d9c673d47fcd5812d69dc07104b706285de56 Mon Sep 02 07:12:35 CDT 2013 Vinod Koul <vinod.koul@intel.com> Merge branch 'topic/sh' into for-linus

Conflicts:
drivers/dma/sh/Kconfig
drivers/dma/sh/shdmac.c

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
/openbmc/linux/include/linux/
H A Dshdma-base.hdiff 265d9c673d47fcd5812d69dc07104b706285de56 Mon Sep 02 07:12:35 CDT 2013 Vinod Koul <vinod.koul@intel.com> Merge branch 'topic/sh' into for-linus

Conflicts:
drivers/dma/sh/Kconfig
drivers/dma/sh/shdmac.c

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
H A Dsh_dma.hdiff 265d9c673d47fcd5812d69dc07104b706285de56 Mon Sep 02 07:12:35 CDT 2013 Vinod Koul <vinod.koul@intel.com> Merge branch 'topic/sh' into for-linus

Conflicts:
drivers/dma/sh/Kconfig
drivers/dma/sh/shdmac.c

Signed-off-by: Vinod Koul <vinod.koul@intel.com>