diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-05-02 12:22:26 -0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-05-02 12:22:26 -0400 |
| commit | b2396f7984ea09e83d489cfca6d5da62cc22945a (patch) | |
| tree | 43e42015e6279af397ec1358a99afcc280b0cfab /Documentation/acpi | |
| parent | 42361f20f29021bfee8d9b5f651362dca83fd705 (diff) | |
| parent | de61608acf89779c8831aaa1428b6975d49d98c0 (diff) | |
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/acpi')
0 files changed, 0 insertions, 0 deletions