From: Tony Lindgren <tony@atomide.com>
Date: Wed, 17 Oct 2012 17:01:30 +0000 (-0700)
Subject: Merge branch 'omap-for-v3.8/cleanup-headers-dma' into omap-for-v3.8/cleanup-headers
X-Git-Tag: omap-for-v3.8/cleanup-headers-signed~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94c657853bd228ebbc2c590b7f81efcc1dde3329;p=pandora-kernel.git

Merge branch 'omap-for-v3.8/cleanup-headers-dma' into omap-for-v3.8/cleanup-headers

Conflicts:
	drivers/crypto/omap-aes.c
	drivers/crypto/omap-sham.c
	drivers/dma/omap-dma.c
---

94c657853bd228ebbc2c590b7f81efcc1dde3329
Reading git-diff-tree failed