Merge 3.14-rc4 into char-misc-linus
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Feb 2014 21:34:54 +0000 (13:34 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Feb 2014 21:34:54 +0000 (13:34 -0800)
commit58e868be77bda526cc8d4264488ed393bc607720
treef95692355ca78239815c1df58fe2fee7dc79d80d
parentd91f9ecfd147bbb2d3089b2e2a603087c668db82
parentcfbf8d4857c26a8a307fb7cd258074c9dcd8c691
Merge 3.14-rc4 into char-misc-linus

Merge this to catch up with the other patches sent upstream.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>