From: Jiri Kosina Date: Mon, 27 Jun 2011 10:40:22 +0000 (+0200) Subject: Merge branch 'upstream' into for-next X-Git-Tag: next-20110726~55^2~8 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6948ddbf9765772c424e36bb018f1fa49f0d141a;p=karo-tx-linux.git Merge branch 'upstream' into for-next --- 6948ddbf9765772c424e36bb018f1fa49f0d141a