Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 3 Dec 2009 05:59:53 +0000 (21:59 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 Dec 2009 05:59:53 +0000 (21:59 -0800)

Trivial merge