tree 1d8c3b5bf21249057efabfbb19abd63960a23a1d
parent 6af74b03e00fc78806f75f6701b24b582bbb5c96
parent da19566552315389370c40e690054a31b7623de5
author Linus Torvalds <torvalds@linux-foundation.org> 1208397517 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1208397517 -0700

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:
  it821x: do not describe noraid parameter with its value
  Pb1200/DBAu1200: fix bad IDE resource size
  Au1200: IDE driver build fix
  Au1200: kill IDE driver function prototypes
  avr32 mustn't select HAVE_IDE