From: Jiri Kosina Date: Sat, 23 Oct 2010 20:44:36 +0000 (+0200) Subject: Merge branches 'upstream' and 'upstream-fixes' into for-linus X-Git-Tag: v2.6.37-rc1~144^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3d9d74336c10c133ed062a1d778d457c6a46422;p=thirdparty%2Fkernel%2Flinux.git Merge branches 'upstream' and 'upstream-fixes' into for-linus --- c3d9d74336c10c133ed062a1d778d457c6a46422