OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
970b064
83bf6f1
)
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
author
Linus Torvalds
<torvalds@linux-foundation.org>
Wed, 28 Apr 2010 14:58:36 +0000
(07:58 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Wed, 28 Apr 2010 14:58:36 +0000
(07:58 -0700)
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
pcmcia: fix matching rules for pseudo-multi-function cards
pcmcia: pcmcia_dev_present bugfix
Trivial merge