| commit | 2927fceafc91afe744e0d1d33f8bbf98c42668fc | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 26 09:46:29 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 26 09:46:29 2009 -0800 |
| tree | b08de3a7caeb3e7f7844d460d0b0edad4387d968 | |
| parent | 36f392d09670d41716e0ba29e1fd1d0445367687 [diff] | |
| parent | ef183f6b5982aa10499432a0cb243c92ce623512 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: drivers/ide/palm_bk3710.c buildfix ide: fix Falcon IDE breakage ide: fix IDE PMAC breakage