diff options
Diffstat (limited to 'fs/xfs')
| tree | fe38c83c49dfd568b540666948ef78cb9d082c38 /fs/affs/affs.h | |
|---|---|---|
| parent | 1c3415a06b1016a596bfe59e0cfee56c773aa958 (diff) | |
| parent | 7a308bb3016f57e5be11a677d15b821536419d36 (diff) | |
Merge tag 'v4.10-rc5' into for-linus
Sync up with mainline to apply fixup to a commit that came through
power supply tree.
Diffstat (limited to 'fs/affs/affs.h')