diff options
| author |   Vinod Koul <vinod.koul@intel.com> | 2013-05-02 21:52:26 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-05-02 21:52:26 +0530 |
| commit | b2396f7984ea09e83d489cfca6d5da62cc22945a (patch) | |
| tree | 43e42015e6279af397ec1358a99afcc280b0cfab /Documentation/devicetree/bindings/timer/cadence,ttc-timer.txt | |
| parent | dmaengine: sirf: move driver init from module_init to subsys_initcall (diff) | |
| parent | dma:of: Use a mutex to protect the of_dma_list (diff) | |
| download | linux-dev-b2396f7984ea09e83d489cfca6d5da62cc22945a.tar.xz linux-dev-b2396f7984ea09e83d489cfca6d5da62cc22945a.zip | |
Merge branch 'topic/of' into for-linus
Conflicts:
include/linux/dmaengine.h
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'Documentation/devicetree/bindings/timer/cadence,ttc-timer.txt')
0 files changed, 0 insertions, 0 deletions