git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6a389f 7b4b88e)
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)
Fixed trivial conflicts  in  drivers/dma/amba-pl08x.c

Signed-off-by: Vinod Koul <vinod.koul@intel.com>

Trivial merge
Pandora Kernel Repository