Merge branch 'linus' into perfcounters/core-v2

Merge reason: we have gathered quite a few conflicts, need to merge upstream

Conflicts:
	arch/powerpc/kernel/Makefile
	arch/x86/ia32/ia32entry.S
	arch/x86/include/asm/hardirq.h
	arch/x86/include/asm/unistd_32.h
	arch/x86/include/asm/unistd_64.h
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/irq.c
	arch/x86/kernel/syscall_table_32.S
	arch/x86/mm/iomap_32.c
	include/linux/sched.h
	kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 8 insertions, 0 deletions

diff --git a/include/linux/sonypi.h b/include/linux/sonypi.h
index f41ffd7c2dd9..34c4475ac4a2 100644
--- a/include/linux/sonypi.h
+++ b/include/linux/sonypi.h
@@ -103,6 +103,14 @@
 #define SONYPI_EVENT_WIRELESS_OFF               61
 #define SONYPI_EVENT_ZOOM_IN_PRESSED            62
 #define SONYPI_EVENT_ZOOM_OUT_PRESSED           63
+#define SONYPI_EVENT_CD_EJECT_PRESSED           64
+#define SONYPI_EVENT_MODEKEY_PRESSED            65
+#define SONYPI_EVENT_PKEY_P4                    66
+#define SONYPI_EVENT_PKEY_P5                    67
+#define SONYPI_EVENT_SETTINGKEY_PRESSED         68
+#define SONYPI_EVENT_VOLUME_INC_PRESSED         69
+#define SONYPI_EVENT_VOLUME_DEC_PRESSED         70
+#define SONYPI_EVENT_BRIGHTNESS_PRESSED         71
 
 /* get/set brightness */
 #define SONYPI_IOCGBRT          _IOR('v', 0, __u8)