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)
commit90621ed829ac64eb25b4d1214e9a5155e5c67ff2
tree472b2cb259bed27fc9ce7a3e6ca413b84830e58f
parent9c0fc4e28b57c5a6da7b58d60f71476c64d457a6
parentbe305042b7a01a1ab03a8adfa95f57bc63e012e1
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