Merge branch 'next' into v3.1-rc4
authorVinod Koul <vinod.koul@linux.intel.com>
Fri, 2 Sep 2011 11:13:44 +0000 (16:13 +0530)
committerVinod Koul <vinod.koul@intel.com>
Fri, 2 Sep 2011 11:13:44 +0000 (16:13 +0530)
commit8516f52fa497b37eb3d5e58d34e61a41ae0a553a
treeb73175b134d36bea303d2f181ae89a448c2add81
parentc6a389f123b9f68d605bb7e0f9b32ec1e3e14132
parent7b4b88e067d37cbbafd856121767f7e154294eb2
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>
drivers/dma/amba-pl08x.c