]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'topic/at_xdmac' of git://git.infradead.org/users/vkoul/slave-dma into...
authorNicolas Ferre <nicolas.ferre@atmel.com>
Wed, 19 Nov 2014 11:11:30 +0000 (12:11 +0100)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Wed, 19 Nov 2014 11:11:30 +0000 (12:11 +0100)

Trivial merge