Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-2.6

author David S. Miller <davem@davemloft.net>

Wed, 3 Mar 2010 07:57:59 +0000 (23:57 -0800)

committer David S. Miller <davem@davemloft.net>

Wed, 3 Mar 2010 07:57:59 +0000 (23:57 -0800)
author David S. Miller <davem@davemloft.net>
Wed, 3 Mar 2010 07:57:59 +0000 (23:57 -0800)
committer David S. Miller <davem@davemloft.net>
Wed, 3 Mar 2010 07:57:59 +0000 (23:57 -0800)
diff --cc drivers/ide/cmd640.c
Simple merge
diff --cc drivers/ide/icside.c
Simple merge
diff --cc drivers/ide/pdc202xx_old.c
Simple merge
diff --cc drivers/ide/scc_pata.c
Simple merge
author	David S. Miller <davem@davemloft.net>
	Wed, 3 Mar 2010 07:57:59 +0000 (23:57 -0800)
committer	David S. Miller <davem@davemloft.net>
	Wed, 3 Mar 2010 07:57:59 +0000 (23:57 -0800)
		1	2
drivers/ide/cmd640.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/ide/icside.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/ide/pdc202xx_old.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/ide/scc_pata.c	patch \|	diff1 \|	diff2 \|	blob \| history