From: Jiri Kosina Date: Sat, 8 Oct 2011 21:21:25 +0000 (+0200) Subject: Merge branch 'upstream-fixes' into for-next X-Git-Tag: next-20111011~76^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6ad6b268729e13fa9df0d352fe4b2b6313a5f912;p=karo-tx-linux.git Merge branch 'upstream-fixes' into for-next --- 6ad6b268729e13fa9df0d352fe4b2b6313a5f912