OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ea8df8c
8929fea
)
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
author
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Sat, 21 Apr 2007 05:58:16 +0000
(22:58 -0700)
committer
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Sat, 21 Apr 2007 05:58:16 +0000
(22:58 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
ide/Kconfig: add missing range check for IDE_MAX_HWIFS
hpt366: fix kernel oops with HPT302N
ide/pci/delkin_cb.c: add new PCI ID
Trivial merge