按键阵修改

	modified:   arch/arm/mach-s5pv210/setup-keypad.c
	modified:   drivers/input/keyboard/samsung-keypad.c
Merge branch 'master' into white_7
添加按键