Merge tag 'v3.19-rc4' into next

Merge with mainline to bring in the latest thermal and other changes.

1 files changed, 5 insertions, 1 deletions

diff --git a/include/uapi/linux/serial_core.h b/include/uapi/linux/serial_core.h
index 5820269aa132..c17218094f18 100644
--- a/include/uapi/linux/serial_core.h
+++ b/include/uapi/linux/serial_core.h
@@ -54,7 +54,8 @@
 #define PORT_ALTR_16550_F32 26  /* Altera 16550 UART with 32 FIFOs */
 #define PORT_ALTR_16550_F64 27  /* Altera 16550 UART with 64 FIFOs */
 #define PORT_ALTR_16550_F128 28 /* Altera 16550 UART with 128 FIFOs */
-#define PORT_MAX_8250   28      /* max port ID */
+#define PORT_RT2880     29      /* Ralink RT2880 internal UART */
+#define PORT_MAX_8250   29      /* max port ID */
 
 /*
  * ARM specific type numbers.  These are not currently guaranteed
@@ -244,4 +245,7 @@
 /* SC16IS74xx */
 #define PORT_SC16IS7XX   108
 
+/* MESON */
+#define PORT_MESON      109
+
 #endif /* _UAPILINUX_SERIAL_CORE_H */