diff options
author | Tony Lindgren <tony@atomide.com> | 2013-02-11 09:20:50 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-02-11 09:20:50 -0800 |
commit | 58a656b77a3d352631d058df0ac2a1da92e3a0f0 (patch) | |
tree | b01c68ffcf0013302dd75a6c9728eba80889f307 /crypto/salsa20_generic.c | |
parent | 8d61d7f94522a0c023ed79d4f690f2bfc8a41d96 (diff) | |
parent | 814a18a5d026464f56b3616704b985f9942b29a6 (diff) | |
download | blackbird-op-linux-58a656b77a3d352631d058df0ac2a1da92e3a0f0.tar.gz blackbird-op-linux-58a656b77a3d352631d058df0ac2a1da92e3a0f0.zip |
Merge tag 'omap-devel-b-for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.9/pm-wfi-take2
On OMAP2+ devices, standardize and clean up WFI entry and WFI blocking.
Basic test logs are available here:
http://www.pwsan.com/omap/testlogs/wfi_devel_a_3.9/20130208085027/
Conflicts:
arch/arm/mach-omap2/pm24xx.c
Diffstat (limited to 'crypto/salsa20_generic.c')
0 files changed, 0 insertions, 0 deletions