]> Git Repo - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d55c29 9161c3b)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorArnd Bergmann <[email protected]>
Wed, 25 Jul 2012 12:33:45 +0000 (14:33 +0200)
committerArnd Bergmann <[email protected]>
Wed, 25 Jul 2012 12:35:04 +0000 (14:35 +0200)
The merge of the 'clk-for-linus' branch caused an automated
merge failure. Pull that in here so we can fix the problem.

Signed-off-by: Arnd Bergmann <[email protected]>

Trivial merge
Empty description
This page took 0.044779 seconds and 4 git commands to generate.