Merge branch 'omap-for-v3.8/cleanup-headers-dma' into omap-for-v3.8/cleanup-headers
authorTony Lindgren <tony@atomide.com>
Wed, 17 Oct 2012 17:01:30 +0000 (10:01 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 17 Oct 2012 17:01:30 +0000 (10:01 -0700)
commit94c657853bd228ebbc2c590b7f81efcc1dde3329
tree4fb0a566594ed2bbbf1dd2076806335a29c1e2cc
parent27615a97b2dc7e98b925973b78d1cdc3ee288ab0
parent2b6c4e73248758bac8e1ed81b0d0664da0fff6f8
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
drivers/crypto/omap-aes.c
drivers/crypto/omap-sham.c
drivers/dma/omap-dma.c