From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 17 Apr 2012 03:35:44 +0000 (+1000)
Subject: Merge remote-tracking branch 'dma-buf/for-next'
X-Git-Tag: next-20120417~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2846c63c6682fe9feca36ec08b68499381ef4513;p=karo-tx-linux.git

Merge remote-tracking branch 'dma-buf/for-next'

Conflicts:
	include/linux/dma-buf.h
---

2846c63c6682fe9feca36ec08b68499381ef4513