From: Jiri Kosina Date: Mon, 10 Sep 2012 21:01:14 +0000 (+0200) Subject: Merge branch 'upstream' into for-next X-Git-Tag: next-20120911~89^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=362c1084f5ed779174065ca434c3304c4288b0f6;p=karo-tx-linux.git Merge branch 'upstream' into for-next --- 362c1084f5ed779174065ca434c3304c4288b0f6