diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-09-02 14:12:35 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-09-02 14:12:35 +0200 |
| commit | 265d9c673d47fcd5812d69dc07104b706285de56 (patch) | |
| tree | ebb686a2ecbf702c4a5cab975cf86fbc10dac5e7 /Documentation/java.txt | |
| parent | Merge branch 'topic/of' into for-linus (diff) | |
| parent | DMA: shdma: fix a bad merge - remove free_irq() (diff) | |
| download | linux-265d9c673d47fcd5812d69dc07104b706285de56.tar.xz linux-265d9c673d47fcd5812d69dc07104b706285de56.zip | |
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>
Diffstat (limited to 'Documentation/java.txt')
0 files changed, 0 insertions, 0 deletions