OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d762f43
2f344d2
)
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Tue, 24 May 2011 18:49:16 +0000
(11:49 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Tue, 24 May 2011 18:49:16 +0000
(11:49 -0700)
* '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
Trivial merge