Linux v3.7.1 for Loongson.
Merge tag 'v3.7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into HEAD

Conflicts:
	drivers/usb/serial/option.c