tree 5a361535d8df880af24e02b1508c2a6b44ae17c5
parent 7a962a4b6e86d27a7ba1c325a5981b52ad72c29b
parent 0414855fdc4a40da05221fc6062cccbc0c30f169
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1393818789 -0800
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1393818789 -0800

Merge 3.14-rc5 into char-misc-next

We want these fixes in here as well.