| commit | 0fcf12d510b6d1b1b090a090c62009310eca4be4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 09 21:05:33 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 09 21:05:33 2010 -0700 |
| tree | bdede7832707c398856cc18578dfa7a0d4a34083 | |
| parent | 4d15393d20c1934a296a999d8ede125532d21cc4 [diff] | |
| parent | cd078af65d5c2f19c0f378062b07a0a79b000723 [diff] |
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: tx493xide: use min_t() macro instead of min() drivers/ide: Use memdup_user via82cxxx: fix typo for VT6415 PCIE PATA IDE Host Controller support. ide-cd: Do not access completed requests in the irq handler