| commit | 1e59977463e9894e3d579d4e1e2a1dc81f456633 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Oct 20 05:56:51 2021 -1000 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Oct 20 05:56:51 2021 -1000 |
| tree | 1c525ed663ff80bb8ddc3653274ff28b7ef475ac | |
| parent | 0afe64bebb13509ef9a4be9deb18286b4c052c93 [diff] | |
| parent | 4cce60f15c04d69eff6ffc539ab09137dbe15070 [diff] |
Merge tag 'nios2_fixes_for_v5.15_part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux Pull nios2 fix from Dinh Nguyen: - Renamed CTL_STATUS to CTL_FSTATUS to fix a redefined warning * tag 'nios2_fixes_for_v5.15_part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: NIOS2: irqflags: rename a redefined register name