[LinuxPPS] 2 Nov 21:32 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[linuxpps: Linus Torvalds <>]

Merge git://git./linux/kernel/git/bart/ide-2.6  
  
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:  
ide-gd: re-get capacity on revalidate  
tx4938ide: Avoid underflow on calculation of a wait cycle  
tx4938ide: Do not call devm_ioremap for whole 128KB  
tx4938ide: Check minimum cycle time and SHWT range (v2)  
ide: Switch to a common address  
ide-cd: fix DMA alignment regression  
  
drivers/ide/alim15x3.c  
drivers/ide/hpt366.c  
drivers/ide/ide-cd.c  
drivers/ide/ide-disk.c  
drivers/ide/ide-gd.c  
drivers/ide/ide-iops.c  
drivers/ide/ide-pci-generic.c  
drivers/ide/ide-proc.c  
drivers/ide/it821x.c  
drivers/ide/jmicron.c  
drivers/ide/piix.c  
drivers/ide/scc_pata.c  
drivers/ide/siimage.c  
drivers/ide/tx4938ide.c

URL: http://gitweb.enneenne.com/?p=linuxpps;a=commit;h=ae29a18594c40a344ddd5bcd6abe575786a5d978