]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 May 2011 18:49:16 +0000 (11:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 May 2011 18:49:16 +0000 (11:49 -0700)
commit5d8f2a35f02c4e119c6d67ff77d9fd44c306da02
treee594aed350730f13874967b2765d21a7f515ea18
parentfc76571cfd7c15a76b12951f912a8bcccbe1439a
parentaa1daff5a89bc285199603bc2e0b51bdbadc6d93
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/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