| commit | 8516f52fa497b37eb3d5e58d34e61a41ae0a553a | [log] [tgz] |
|---|---|---|
| author | Vinod Koul <vinod.koul@linux.intel.com> | Fri Sep 02 16:43:44 2011 +0530 |
| committer | Vinod Koul <vinod.koul@intel.com> | Fri Sep 02 16:43:44 2011 +0530 |
| tree | b73175b134d36bea303d2f181ae89a448c2add81 | |
| parent | c6a389f123b9f68d605bb7e0f9b32ec1e3e14132 [diff] | |
| parent | 7b4b88e067d37cbbafd856121767f7e154294eb2 [diff] |
Merge branch 'next' into v3.1-rc4 Fixed trivial conflicts in drivers/dma/amba-pl08x.c Signed-off-by: Vinod Koul <vinod.koul@intel.com>