summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-13 17:49:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-13 17:49:48 -0700
commit2ba3abd8186f24c7fb418927025b4e2120e3a362 (patch)
tree1b88919b5e687c77627d91855b214ed5067997da /security
parent0fdfe5ad2802e747460bf48eb2eb0ca3d3f3af42 (diff)
parentd88d4050dcaf09e417aaa9a5024dd9449ef71b2e (diff)
downloadop-kernel-dev-2ba3abd8186f24c7fb418927025b4e2120e3a362.zip
op-kernel-dev-2ba3abd8186f24c7fb418927025b4e2120e3a362.tar.gz
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM / Hibernate: user.c, fix SNAPSHOT_SET_SWAP_AREA handling
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud