Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Apr 2008 21:01:25 +0000 (14:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Apr 2008 21:01:25 +0000 (14:01 -0700)
commiteeb85d0b0e312ab9a6c3476f18308409913ab369
tree944f1df067be0e4fd0989643cd72b621ef890d7a
parent355a46961b58012de239cafccbfce4c9321d4395
parent6d1cee44361b8d06ccd1812e80448d86ae60dfe3
Merge git://git./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