Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
commitad3c7e42e33a842cf3b518e21a7f69e167649d8a
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Apr 2008 21:26:53 +0000 (7 14:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Apr 2008 21:26:53 +0000 (7 14:26 -0700)
tree10860203beaf5721f566d2b253d6e30c886d50f8
parent6ea0a4679d6a11c66cfeb26d15244fb6f9b52d14
parentc976816b6e901341ec3c4653147316c15549a1c4
Merge git://git./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