From: Jiri Kosina Date: Mon, 19 Dec 2011 08:17:28 +0000 (+0100) Subject: Merge branch 'upstream' into for-next X-Git-Tag: next-20111220~75^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ed2a49bdcff250d1a4725b21f9d39de74f0eea54;p=karo-tx-linux.git Merge branch 'upstream' into for-next --- ed2a49bdcff250d1a4725b21f9d39de74f0eea54