From: Tony Lindgren Date: Tue, 7 Apr 2009 18:05:35 +0000 (-0700) Subject: Merge branch 'omap-fixes' X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a01c39f66dd61c735219c35e107a809b98834570;p=linux-2.6-omap-h63xx.git Merge branch 'omap-fixes' --- a01c39f66dd61c735219c35e107a809b98834570 diff --cc arch/arm/plat-omap/dma.c index 3fd0e77bb9f,559cbb53744..609301860c5 mode 100755,100644..100755 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c