Merge branch 'master' of https://github.com/wangge1989/ps2joystick

Conflicts:
	drivers/src/joystick.c
Merge branch 'master' of https://github.com/wangge1989/ps2joystick

Conflicts:
	drivers/src/joystick.c