| commit | 988c7f2d6d5622c2407bcad49c0349fbad6489a7 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 24 May 2011 18:49:16 +0000 (24 11:49 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 24 May 2011 18:49:16 +0000 (24 11:49 -0700) | ||
| tree | e594aed350730f13874967b2765d21a7f515ea18 | treesnapshot (tar.gz zip) |
| parent | d762f4383100c2a87b1a3f2d678cd3b5425655b4 | commitdiff |
| parent | 2f344d2e51888785be551a756d8a8aa58269aaa8 | commitdiff |
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
* '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