]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a2c2136 9f28056)
Merge remote-tracking branch 'dma-buf/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 03:35:44 +0000 (13:35 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 03:35:44 +0000 (13:35 +1000)
Conflicts:
include/linux/dma-buf.h

1  2 
drivers/base/Kconfig patch | diff1 | diff2 | blob | history

diff --cc drivers/base/Kconfig
Simple merge
Linux kernel for KaRo TX COM modules