From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 22 Jan 2021 23:11:25 +0000 (+0100)
Subject: Merge branch 'asm-generic-fixes' into asm-generic
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=38489db09b109c22eedf6cd3846ef742bceb45fe;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'asm-generic-fixes' into asm-generic

* asm-generic-fixes:
  ia64: Mark architecture as orphaned
  ia64: fix xchg() warning
  ia64: fix timer cleanup regression
---

38489db09b109c22eedf6cd3846ef742bceb45fe