From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 May 2011 18:49:16 +0000 (-0700)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~7613^2~1309
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=988c7f2d6d5622c2407bcad49c0349fbad6489a7;p=firefly-linux-kernel-4.4.55.git

Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, ioapic: Restore ioapic entries during resume properly
  x86: Get rid of asmregparm
  um: Use RWSEM_GENERIC_SPINLOCK on x86
---

988c7f2d6d5622c2407bcad49c0349fbad6489a7