Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Jul 2008 18:19:11 +0000 (11:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Jul 2008 18:19:11 +0000 (11:19 -0700)
* 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


Trivial merge