From: Linus Torvalds Date: Thu, 17 Apr 2008 01:58:37 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c970d5a32ae1a90fba89892cc3432cf0b408cb8b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge git://git./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 --- c970d5a32ae1a90fba89892cc3432cf0b408cb8b