From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 29 Apr 2008 21:01:25 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.26-rc1~355
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eeb85d0b0e312ab9a6c3476f18308409913ab369;p=linux-2.6

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
---

eeb85d0b0e312ab9a6c3476f18308409913ab369