git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
959f585
2abd5f1
)
Merge branch 'for-linus' into next
author
Vinod Koul
<vinod.koul@intel.com>
Wed, 30 Oct 2013 07:37:18 +0000
(13:07 +0530)
committer
Vinod Koul
<vinod.koul@intel.com>
Wed, 30 Oct 2013 07:37:18 +0000
(13:07 +0530)
Conflicts:
drivers/dma/edma.c
Moved the memory leak fix post merge
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff