summaryrefslogtreecommitdiff
path: root/include/linux/kobj_completion.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-24 21:43:21 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-24 21:43:21 +0400
commit5bd2010fbe027b224db2e74a4fdfec9a7b7918d2 (patch)
tree59106aae3930a3608409c101ec32d68742c8d168 /include/linux/kobj_completion.h
parent41f107266b19d100c1bcef9e1e1aef00692c1209 (diff)
parent413541dd66d51f791a0b169d9b9014e4f56be13c (diff)
downloadlinux-5bd2010fbe027b224db2e74a4fdfec9a7b7918d2.tar.xz
Merge 3.13-rc5 into staging-next
We want these fixes here to handle some merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/kobj_completion.h')
0 files changed, 0 insertions, 0 deletions