From: Paul Mundt Date: Thu, 28 Jun 2012 07:46:13 +0000 (+0900) Subject: Merge branches 'sh/urgent' and 'sh/trivial' into sh-fixes-for-linus X-Git-Tag: firefly_0821_release~3680^2~2548^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e9bcd470d814473c31ffc5d09e249396a2196ad4;p=firefly-linux-kernel-4.4.55.git Merge branches 'sh/urgent' and 'sh/trivial' into sh-fixes-for-linus --- e9bcd470d814473c31ffc5d09e249396a2196ad4