]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit7e2f587448fb2ef0ed85f0f2898a2ad9a08a6e48
tree4fb0a566594ed2bbbf1dd2076806335a29c1e2cc
parentb44f78255944356d76b14e850b0b44c39f2f8fa8
parente3b050364d92ca5df92854f7167de60df2ba377b
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