From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 Jul 2008 18:19:11 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v3.12-rc1~20155
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=90621ed829ac64eb25b4d1214e9a5155e5c67ff2;p=kernel%2Fkernel-generic.git

Merge git://git./linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  it8213: fix return value in it8213_init_one()
  palm_bk3710: fix IDECLK period calculation
  ide: add __ide_default_irq() inline helper
---

90621ed829ac64eb25b4d1214e9a5155e5c67ff2