Merge branch 'for-linus' into for-next

Merging the HD-audio fixes back to base devel branch for further working on it.
2015-03-09 08:42:00 +01:00
parent 5371fc0ecd a1f3f1ca66
commit 4aa01c408b
325 changed files with 3554 additions and 1953 deletions
@@ -65,6 +65,10 @@ struct serial_struct {
 #define SERIAL_IO_PORT	0
 #define SERIAL_IO_HUB6	1
 #define SERIAL_IO_MEM	2
+#define SERIAL_IO_MEM32	  3
+#define SERIAL_IO_AU	  4
+#define SERIAL_IO_TSI	  5
+#define SERIAL_IO_MEM32BE 6

 #define UART_CLEAR_FIFO		0x01
 #define UART_USE_FIFO		0x02
@@ -9,3 +9,4 @@ header-y += tc_pedit.h
 header-y += tc_skbedit.h
 header-y += tc_vlan.h
 header-y += tc_bpf.h
+header-y += tc_connmark.h