tree b08de3a7caeb3e7f7844d460d0b0edad4387d968
parent 36f392d09670d41716e0ba29e1fd1d0445367687
parent ef183f6b5982aa10499432a0cb243c92ce623512
author Linus Torvalds <torvalds@linux-foundation.org> 1232991989 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1232991989 -0800

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:
  drivers/ide/palm_bk3710.c buildfix
  ide: fix Falcon IDE breakage
  ide: fix IDE PMAC breakage