]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'next' into v3.1-rc4
authorVinod Koul <vinod.koul@linux.intel.com>
Fri, 2 Sep 2011 11:13:44 +0000 (16:43 +0530)
committerVinod Koul <vinod.koul@intel.com>
Fri, 2 Sep 2011 11:13:44 +0000 (16:43 +0530)
commite2a3db6d1eb7dfdc3cfb887d765e1344af5ae676
treeb73175b134d36bea303d2f181ae89a448c2add81
parentd3fce04d00ed540d41d01114d1d7be4cf7c0a8a5
parent3d50ba164fa05b105e435ba357d366f41e7cb5c0
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