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, 3 insertions, 2 deletions

diff --git a/include/linux/atmlec.h b/include/linux/atmlec.h
index 6f5a1bab8f50..39c917fd1b96 100644
--- a/include/linux/atmlec.h
+++ b/include/linux/atmlec.h
@@ -11,6 +11,7 @@
 #include <linux/atmioc.h>
 #include <linux/atm.h>
 #include <linux/if_ether.h>
+#include <linux/types.h>
 
 /* ATM lec daemon control socket */
 #define ATMLEC_CTRL     _IO('a', ATMIOC_LANE)
@@ -78,8 +79,8 @@ struct atmlec_msg {
                 } normal;
                 struct atmlec_config_msg config;
                 struct {
-                        uint16_t lec_id;                        /* requestor lec_id  */
-                        uint32_t tran_id;                       /* transaction id    */
+                        __u16 lec_id;                           /* requestor lec_id  */
+                        __u32 tran_id;                          /* transaction id    */
                         unsigned char mac_addr[ETH_ALEN];       /* dst mac addr      */
                         unsigned char atm_addr[ATM_ESA_LEN];    /* reqestor ATM addr */
                 } proxy;        /*