From: Paul Mundt Date: Thu, 16 Jun 2011 06:12:08 +0000 (+0900) Subject: Merge branches 'common/dma' and 'sh/stable-updates' into sh-latest X-Git-Tag: firefly_0821_release~3680^2~4791^2~23 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d0459e1afa58a225f074d85226bf0d7b9e54eff3;p=firefly-linux-kernel-4.4.55.git Merge branches 'common/dma' and 'sh/stable-updates' into sh-latest --- d0459e1afa58a225f074d85226bf0d7b9e54eff3