Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

drivers/ide/Makefile

drivers/ide/aec62xx.c

drivers/ide/ali14xx.c

drivers/ide/alim15x3.c

drivers/ide/amd74xx.c

drivers/ide/arm/Makefile

drivers/ide/atiixp.c

drivers/ide/au1xxx-ide.c

drivers/ide/buddha.c

drivers/ide/cmd640.c

drivers/ide/cmd64x.c

drivers/ide/cs5520.c

drivers/ide/cs5530.c

drivers/ide/cs5535.c

drivers/ide/cy82c693.c

drivers/ide/delkin_cb.c

drivers/ide/dtc2278.c

drivers/ide/falconide.c

drivers/ide/gayle.c

drivers/ide/generic.c