From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 26 Jan 2009 17:46:29 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.29-rc3~43
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2927fceafc91afe744e0d1d33f8bbf98c42668fc;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:
  drivers/ide/palm_bk3710.c buildfix
  ide: fix Falcon IDE breakage
  ide: fix IDE PMAC breakage
---

2927fceafc91afe744e0d1d33f8bbf98c42668fc