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:
48fe37c
15d0a87
)
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
author
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 7 May 2010 21:11:09 +0000
(14:11 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 7 May 2010 21:11:09 +0000
(14:11 -0700)
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
pcmcia: fix compilation after 16bit state locking changes
pcmcia: order userspace suspend and resume requests
pcmcia: avoid pccard_validate_cis failure in resume callpath
Trivial merge