git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
88ce755
7894eaf
)
Merge branch 'irq-pio'
author
Tejun Heo
<htejun@gmail.com>
Mon, 15 May 2006 11:59:15 +0000
(20:59 +0900)
committer
Tejun Heo
<htejun@gmail.com>
Mon, 15 May 2006 11:59:15 +0000
(20:59 +0900)
Conflicts:
drivers/scsi/libata-core.c
include/linux/libata.h
Trivial merge