Greg Kroah-Hartman 9f48c89862 Merge 3.16-rc5 into char-misc-next
This resolves a number of merge issues with changes in this tree and
Linus's tree at the same time.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-07-13 15:26:47 -07:00
..
2014-06-10 20:20:42 -06:00
2014-06-10 20:20:42 -06:00
2014-06-10 20:20:42 -06:00
2014-05-30 09:34:27 -06:00
2014-06-10 20:20:19 -06:00
2014-06-10 20:20:19 -06:00
2014-06-10 20:20:42 -06:00
2014-06-10 20:20:19 -06:00
2014-06-10 20:20:19 -06:00
2014-06-10 20:20:19 -06:00
2014-06-10 20:20:19 -06:00
2014-06-10 20:20:19 -06:00