tree cbe3ffc375950b016198fa61dea63bb449c59c93
parent 979b1791e5b8f8b556faeec4c48339e7ed63af9f
parent cb28a1bbdb4790378e7366d6c9ee1d2340b84f92
author Jesse Barnes <jbarnes@hobbes.lan> 1217283346 -0700
committer Jesse Barnes <jbarnes@virtuousgeek.org> 1217283346 -0700

Merge branch 'core/generic-dma-coherent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into for-linus