| commit | eeb85d0b0e312ab9a6c3476f18308409913ab369 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 29 14:01:25 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 29 14:01:25 2008 -0700 |
| tree | 944f1df067be0e4fd0989643cd72b621ef890d7a | |
| parent | 355a46961b58012de239cafccbfce4c9321d4395 [diff] | |
| parent | 6d1cee44361b8d06ccd1812e80448d86ae60dfe3 [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: alim15x3: disable init_hwif_ali15x3 for PowerPC ide: fix crash at boot with siimage driver