From: Jiri Kosina Date: Mon, 17 Sep 2012 15:27:35 +0000 (+0200) Subject: Merge branch 'upstream' into for-next X-Git-Tag: next-20120918~87^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a549d1da12f6eef8c214efa12372302c890dc43d;p=karo-tx-linux.git Merge branch 'upstream' into for-next --- a549d1da12f6eef8c214efa12372302c890dc43d