Merge branch 'ide-dcr' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/misc
authorDavid S. Miller <davem@davemloft.net>
Thu, 3 Dec 2009 21:25:13 +0000 (13:25 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 Dec 2009 21:25:13 +0000 (13:25 -0800)

Trivial merge