Merge branch 'x86/cpu' into x86/xsave

Conflicts:

	arch/x86/kernel/cpu/feature_names.c
	include/asm-x86/cpufeature.h

1 files changed, 3 insertions, 2 deletions

diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
index 809132de31d2..dd657163cd8d 100644
--- a/arch/arm/mach-orion5x/ts209-setup.c
+++ b/arch/arm/mach-orion5x/ts209-setup.c
@@ -207,12 +207,12 @@ static struct i2c_board_info __initdata qnap_ts209_i2c_rtc = {
 
 static struct gpio_keys_button qnap_ts209_buttons[] = {
         {
-                .code           = KEY_RESTART,
+                .code           = KEY_COPY,
                 .gpio           = QNAP_TS209_GPIO_KEY_MEDIA,
                 .desc           = "USB Copy Button",
                 .active_low     = 1,
         }, {
-                .code           = KEY_POWER,
+                .code           = KEY_RESTART,
                 .gpio           = QNAP_TS209_GPIO_KEY_RESET,
                 .desc           = "Reset Button",
                 .active_low     = 1,
@@ -296,6 +296,7 @@ static void __init qnap_ts209_init(void)
         orion5x_i2c_init();
         orion5x_sata_init(&qnap_ts209_sata_data);
         orion5x_uart0_init();
+        orion5x_xor_init();
 
         orion5x_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE,
                                    QNAP_TS209_NOR_BOOT_SIZE);