tree 4fb0a566594ed2bbbf1dd2076806335a29c1e2cc
parent 27615a97b2dc7e98b925973b78d1cdc3ee288ab0
parent 2b6c4e73248758bac8e1ed81b0d0664da0fff6f8
author Tony Lindgren <tony@atomide.com> 1350493290 -0700
committer Tony Lindgren <tony@atomide.com> 1350493290 -0700

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