]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Apr 2008 01:58:37 +0000 (18:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Apr 2008 01:58:37 +0000 (18:58 -0700)
commitd63a74cc2f9d84584ce2bd06f741f7955cdc4128
tree1d8c3b5bf21249057efabfbb19abd63960a23a1d
parent59b7d4e2a18dd95f5244ecde368a44a7891f4843
parent6fe904face6039c2cd2ca6ed4685b9f299473f92
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