diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-27 18:05:14 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-27 18:05:14 -0700 |
commit | 3d52acb34247816c453f94596e6c7fc4499b76dc (patch) | |
tree | 39d2f862ec41006d7f25a58c4732a29cab22b5c0 /drivers/ide/ide-disk.c | |
parent | f786648b89f00d4e66fe6b19beffd30e764651fc (diff) | |
parent | 214838a2108b4b1e18abce2e28d37996e9bf7c68 (diff) | |
download | linux-3.10-3d52acb34247816c453f94596e6c7fc4499b76dc.tar.gz linux-3.10-3d52acb34247816c453f94596e6c7fc4499b76dc.tar.bz2 linux-3.10-3d52acb34247816c453f94596e6c7fc4499b76dc.zip |
Merge refs/heads/upstream-fixes from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/ide/ide-disk.c')
0 files changed, 0 insertions, 0 deletions