From: Paul Mundt Date: Thu, 13 May 2010 08:48:05 +0000 (+0900) Subject: Merge branch 'sh/lmb' X-Git-Tag: v2.6.35-rc1~504^2~7 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef4ed97d6bd91aa41907181e80a7feaf2721719a;p=pandora-kernel.git Merge branch 'sh/lmb' Conflicts: arch/sh/kernel/setup.c --- ef4ed97d6bd91aa41907181e80a7feaf2721719a Reading git-diff-tree failed