diff options
author | James Bottomley <jejb@titanic.(none)> | 2005-09-06 22:52:54 (GMT) |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2005-09-06 22:52:54 (GMT) |
commit | 17fa53da1239b8712c5cebbd72a74c713b6c2db9 (patch) | |
tree | 8cf55e47ce681a6c899ccf8e06abeccecb20d38b /drivers/ide | |
parent | 3173d8c342971a03857d8af749a3f57da7d06b57 (diff) | |
parent | fe1b2d544d71300f8e2d151c3c77a130d13a58be (diff) | |
download | linux-fsl-qoriq-17fa53da1239b8712c5cebbd72a74c713b6c2db9.tar.xz |
Merge by hand (conflicts in sd.c)
Diffstat (limited to 'drivers/ide')
0 files changed, 0 insertions, 0 deletions