Merge 3.11-rc4 into tty-next

We want the tty fixes in here as well.

Greg Kroah-Hartman committed 13 years ago

Commit 5ac1ccb2 parents a4f2dc9 c095ba7385 files · +3840 −2189Browse files

Showing the changes to include/uapi/linux (2 of 385 files). Show all

Unified · Split

2 files

@@ -215,8 +215,8 @@ struct fw_cdev_event_request2 { · 214 unmodified lines
215	215	* with the %FW_CDEV_ISO_INTERRUPT bit set, when explicitly requested with
216	216	* %FW_CDEV_IOC_FLUSH_ISO, or when there have been so many completed packets
217	217	* without the interrupt bit set that the kernel's internal buffer for @header
218		− * is about to overflow. (In the last case, kernels with ABI version < 5 drop
219		− * header data up to the next interrupt packet.)
	218	+ * is about to overflow. (In the last case, ABI versions < 5 drop header data
	219	+ * up to the next interrupt packet.)
220	220	*
221	221	* Isochronous transmit events (context type %FW_CDEV_ISO_CONTEXT_TRANSMIT):
222	222	*

@@ -69,8 +69,8 @@ · 68 unmodified lines
69	69	* starting a poll from a device which has a secure element enabled means
70	70	* we want to do SE based card emulation.
71	71	* @NFC_CMD_DISABLE_SE: Disable the physical link to a specific secure element.
72		− * @NFC_CMD_FW_UPLOAD: Request to Load/flash firmware, or event to inform that
73		− * some firmware was loaded
	72	+ * @NFC_CMD_FW_DOWNLOAD: Request to Load/flash firmware, or event to inform
	73	+ * that some firmware was loaded
74	74	*/
75	75	enum nfc_commands {
76	76	NFC_CMD_UNSPEC,
@@ -94,7 +94,7 @@ enum nfc_commands { · 17 unmodified lines
94	94	NFC_CMD_DISABLE_SE,
95	95	NFC_CMD_LLC_SDREQ,
96	96	NFC_EVENT_LLC_SDRES,
97		− NFC_CMD_FW_UPLOAD,
	97	+ NFC_CMD_FW_DOWNLOAD,
98	98	NFC_EVENT_SE_ADDED,
99	99	NFC_EVENT_SE_REMOVED,
100	100	/* private: internal use only */