From: Arnd Bergmann Date: Fri, 16 Mar 2012 19:15:48 +0000 (+0000) Subject: Merge branch 'depends/driver-core' into ux500/dt X-Git-Tag: v3.4-rc1~71^2~3^2~10 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab2f75ce55ef6f903348026271e30796f016851f;p=pandora-kernel.git Merge branch 'depends/driver-core' into ux500/dt Conflicts: drivers/base/cpu.c --- ab2f75ce55ef6f903348026271e30796f016851f Reading git-diff-tree failed