From: Jiri Kosina Date: Sat, 8 Jan 2011 00:08:19 +0000 (+0100) Subject: Merge branches 'upstream' and 'upstream-fixes' into for-linus X-Git-Tag: v2.6.38-rc1~442^2~7 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7153258b70ccbe3922fcee9ca4271d4f4c2bc55;p=pandora-kernel.git Merge branches 'upstream' and 'upstream-fixes' into for-linus --- a7153258b70ccbe3922fcee9ca4271d4f4c2bc55 Reading git-diff-tree failed