Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 3 Mar 2010 07:57:59 +0000 (23:57 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 3 Mar 2010 07:57:59 +0000 (23:57 -0800)
commit950f564b707ca1b1c5bb94cd1e7d2a0702bfcadc
tree290cc32af2f8cfd232c57d491733592aed4dbf88
parentb1681c56f5b6bf551bed2617a395855055836571
parent8495fb1b8d016657133c01a2f258c5f192d2a1b7
Merge branch 'master' of /linux/kernel/git/davem/ide-2.6
drivers/ide/cmd640.c
drivers/ide/icside.c
drivers/ide/pdc202xx_old.c
drivers/ide/scc_pata.c