summaryrefslogtreecommitdiff
path: root/kernel/power/user.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-24 13:33:45 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-24 13:33:45 -0800
commit35efc5a425e3db676b3d1ab9f23705a3977cfdcd (patch)
tree5dd2f9211b17eaad73f09bdc80172bea7dbb0760 /kernel/power/user.c
parent0a191749ce19112f8f20675232b951dccd4ae00e (diff)
parentcfbf8d4857c26a8a307fb7cd258074c9dcd8c691 (diff)
Merge 3.14-rc4 into char-misc-next
We want these fixes here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/power/user.c')
0 files changed, 0 insertions, 0 deletions