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

Conflicts:
	drivers/usb/serial/option.c