diff options
author | Tony Lindgren <tony@atomide.com> | 2010-05-20 22:11:44 +0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-05-20 22:11:44 +0400 |
commit | 5a5f561e4060844a37d8fe81dce2352c406aac97 (patch) | |
tree | 8374fb43035ac6f93cf3e15f054e3a4e6acbf078 /security/keys | |
parent | 935d918046d4c29f053d56fff67d6a21495fd780 (diff) | |
parent | 331b9e3d61cba2ad089f3f1fe2ef0122679337a1 (diff) | |
download | linux-5a5f561e4060844a37d8fe81dce2352c406aac97.tar.xz |
Merge branch 'pm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'security/keys')
0 files changed, 0 insertions, 0 deletions