nt f56b71f5d5a3944acdcb0e5e1739574d95ddf61a parent da5a70f3519fd6f73ece3eea261a861c9a4d6bbd author Arnd Bergmann 1331925348 +0000 committer Arnd Bergmann 1331925348 +0000 Merge branch 'depends/driver-core' into ux500/dt Conflicts: drivers/base/cpu.c vŽgS•