Merge tag 'v3.7-rc4'

Merge Linux 3.7-rc4 to get fixes for CMA.
This commit is contained in:
Tomi Valkeinen
2012-11-16 11:41:51 +02:00
1187 changed files with 16307 additions and 12731 deletions

View File

@@ -40,10 +40,10 @@
#define OMAP_UART_WER_MOD_WKUP 0X7F
/* Enable XON/XOFF flow control on output */
#define OMAP_UART_SW_TX 0x8
#define OMAP_UART_SW_TX 0x04
/* Enable XON/XOFF flow control on input */
#define OMAP_UART_SW_RX 0x2
#define OMAP_UART_SW_RX 0x04
#define OMAP_UART_SYSC_RESET 0X07
#define OMAP_UART_TCR_TRIG 0X0F