diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-08 16:45:36 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-08 16:45:36 +0200 |
| commit | cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30 (patch) | |
| tree | d3e3f2067dc423721d698d154e15213aa5b0132d /drivers/net/arm/etherh.c | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/... (diff) | |
| parent | ide: Fix IDE taskfile with cfq scheduler (diff) | |
| download | linux-cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30.tar.xz linux-cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
ide: Fix IDE taskfile with cfq scheduler
ide: Must hold queue lock when requeueing
ide: Requeue request after DMA timeout
Diffstat (limited to 'drivers/net/arm/etherh.c')
0 files changed, 0 insertions, 0 deletions