diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-10-26 11:03:02 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-10-26 11:03:02 -0300 |
| commit | 3a55445f11e6b1dbdc1e7f2684a519089d2e163c (patch) | |
| tree | ce449fbd02b8dde1adf10bf4e2f291c9fa1fe4dc /arch/arm/mach-s3c/crag6410.h | |
| parent | 342cb7ebf5e29fff4dc09ab2c8f37d710f8f5206 (diff) | |
| parent | 3906fe9bb7f1a2c8667ae54e967dc8690824f4ea (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up the fixes from upstream.
Fix simple conflict on session.c related to the file position fix that
went upstream and is touched by the active decomp changes in perf/core.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'arch/arm/mach-s3c/crag6410.h')
0 files changed, 0 insertions, 0 deletions