]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'dma-buf/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Oct 2012 02:56:04 +0000 (13:56 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Oct 2012 02:56:04 +0000 (13:56 +1100)
1  2 
drivers/base/dma-buf.c

Simple merge