Merge 4.7-rc4 into staging-next

We want the fixes in here, and we can resolve a merge issue in drivers/iio/industrialio-trigger.c

Greg Kroah-Hartman committed 10 years ago

Commit af527392 parents 25ed6a5 33688ab561 files · +5198 −3321Browse files

Showing the changes to include/uapi (3 of 561 files). Show all

Unified · Split

3 files

@@ -118,7 +118,7 @@ struct btrfs_ioctl_vol_args_v2 { · 117 unmodified lines
118	};	118	};
119	union {	119	union {
120	char name[BTRFS_SUBVOL_NAME_MAX + 1];	120	char name[BTRFS_SUBVOL_NAME_MAX + 1];
121	u64 devid;	121	__u64 devid;
122	};	122	};
123	};	123	};
124		124

 # UAPI Header export list
 header-y += asequencer.h
+header-y += asoc.h
 header-y += asound.h
 header-y += asound_fm.h
 header-y += compress_offload.h
 header-y += hdspm.h
 header-y += sb16_csp.h
 header-y += sfnt_info.h
+header-y += tlv.h
+header-y += usb_stream.h

Keyboard shortcuts