From: Jiri Kosina Date: Wed, 23 Jul 2008 13:26:10 +0000 (+0200) Subject: Merge branches 'upstream' and 'upstream-fixes' into for-linus X-Git-Tag: v2.6.27-rc1~855^2 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b22d8370061898f3029cdc2601fbdec493443f03;p=linux-2.6 Merge branches 'upstream' and 'upstream-fixes' into for-linus --- b22d8370061898f3029cdc2601fbdec493443f03