Merge branch 'topic/sh' into for-linus

Browse source

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

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

...

This commit is contained in:

Vinod Koul 2013-09-02 17:42:35 +05:30

parent 592745e2f8 e5ffa401ea

commit 265d9c673d

13 changed files with 1185 additions and 1052 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

55

include/linux/sh_dma.h

View file

3

include/linux/shdma-base.h

View file