Merge branch 'core/generic-dma-coherent' of git://git.kernel.org/pub/scm/linux/kernel...
authorJesse Barnes <jbarnes@hobbes.lan>
Mon, 28 Jul 2008 22:15:46 +0000 (15:15 -0700)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Mon, 28 Jul 2008 22:15:46 +0000 (15:15 -0700)

Trivial merge