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)

Trivial merge