From: Jiri Kosina Date: Fri, 20 Dec 2013 22:26:44 +0000 (+0100) Subject: Merge branch 'for-3.14/upstream' into for-next X-Git-Tag: next-20140106~75^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6d36023ee16488f17ce9ad154c5d35c86d8042bd;p=karo-tx-linux.git Merge branch 'for-3.14/upstream' into for-next --- 6d36023ee16488f17ce9ad154c5d35c86d8042bd