aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-09-11 07:54:14 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-11 07:54:14 -0700
commit3f2f1257ff6327e330d9e4f0ba1a48a73b0044dc (patch)
treee64179c528521b544634e055a222e120e0987530 /init
parent28a2a3f58707cba16b329b90f601c01599456491 (diff)
parent6708374178d225ef77571ed23b30e8a93c36add5 (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PATCH] ata_piix: add map 01b for ICH7M [libata] sata_mv: errata check buglet fix
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions