OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1be62dc
8243e63
)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 4 Apr 2008 21:40:04 +0000
(14:40 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 4 Apr 2008 21:40:04 +0000
(14:40 -0700)
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
pata_ali: disable ATAPI DMA
libata: ATA_12/16 doesn't fall into ATAPI_MISC
libata: uninline atapi_cmd_type()
libata: fix IDENTIFY order in ata_bus_probe()
Trivial merge