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:
78ae87c
899b69d
)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
author
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Mon, 4 Jun 2007 20:25:59 +0000
(13:25 -0700)
committer
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Mon, 4 Jun 2007 20:25:59 +0000
(13:25 -0700)
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[ATA]: Don't allow to enable this for SPARC64 without PCI.
[VIDEO]: XVR500 and XVR2500 require FB=y
Trivial merge