| commit | e84a41135b6feb2e9b10b8c7e79394cc722d3329 | [log] [tgz] |
|---|---|---|
| author | Stephen Rothwell <sfr@canb.auug.org.au> | Fri May 20 21:54:45 2022 +1000 |
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | Fri May 20 21:54:45 2022 +1000 |
| tree | 4ba644d6b994ac5e6e9b8e996680767ec00231ea | |
| parent | 506dda0f69260ab7cc380e2ef886e4cb211b446c [diff] | |
| parent | ed5edd5a70b9525085403f193786395179ea303d [diff] |
Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git # Conflicts: # drivers/misc/lkdtm/stackleak.c