3.4.10
restore comments
Merge commit 'cdb5999b9391cbb118dbf5cb79f5d2e5eb7e055f' into jelly_3.4

Conflicts:
	fs/jbd2/journal.c
	include/linux/usb.h
restore comments