diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-17 19:01:30 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-17 19:01:30 +0200 |
| commit | 94c657853bd228ebbc2c590b7f81efcc1dde3329 (patch) | |
| tree | 4fb0a566594ed2bbbf1dd2076806335a29c1e2cc /security/security.c | |
| parent | ARM: OMAP: Trivial driver changes to remove include plat/cpu.h (diff) | |
| parent | ARM: OMAP: DMA: Move plat/dma.h to plat-omap/dma-omap.h (diff) | |
| download | linux-94c657853bd228ebbc2c590b7f81efcc1dde3329.tar.xz linux-94c657853bd228ebbc2c590b7f81efcc1dde3329.zip | |
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
Diffstat (limited to 'security/security.c')
0 files changed, 0 insertions, 0 deletions