]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit2846c63c6682fe9feca36ec08b68499381ef4513
tree5a319915e32e29ed2227ac33157251721a922c8d
parenta2c21365c81bd1c56696258d86dac60a6649711c
parent9f28056eee49f080166ca6c3aea449e0df189134
Merge remote-tracking branch 'dma-buf/for-next'

Conflicts:
include/linux/dma-buf.h
drivers/base/Kconfig