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
This commit is contained in:
Linus Torvalds 2008-04-07 14:26:53 -07:00
commit ad3c7e42e3