From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 7 Apr 2008 21:26:53 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.25-rc9~48
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ad3c7e42e33a842cf3b518e21a7f69e167649d8a;p=linux-2.6-omap-h63xx.git

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:
  siimage: fix kernel oops on PPC 44x
---

ad3c7e42e33a842cf3b518e21a7f69e167649d8a