]> 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)
commitbb521d9d3342feaab6f2097bffd7fe3c1b4c5b1f
treeb73175b134d36bea303d2f181ae89a448c2add81
parent8ad95c648ce15cc2a0e2109c6e08773949bae72f
parenta8faec84b5ed6f6a50899366b7f2ce7d0547164b
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