From: Jiri Kosina Date: Mon, 28 Nov 2011 10:12:46 +0000 (+0100) Subject: Merge branch 'upstream' into for-next X-Git-Tag: next-20111201~62^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=97c718638f5d79c299eee7c6f1638cd1c6598bcf;p=karo-tx-linux.git Merge branch 'upstream' into for-next --- 97c718638f5d79c299eee7c6f1638cd1c6598bcf