| commit | c46f87f121f815a67e84379511310e5c03862a60 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 08 09:04:55 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 08 09:04:55 2009 -0700 |
| tree | 56c25d0ab7cd45b388810629afb52f8a983d7aa6 | |
| parent | 6025974bab1c3da8662df79bdeb694588bc3eb93 [diff] | |
| parent | 669165daad2ec839df85b8c5f7bc155e76a2f404 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: pdc202xx_old: fix resetproc() method pdc202xx_old: fix 'pdc20246_dma_ops'