]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5d2d379 7407de2)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorArnd Bergmann <arnd@arndb.de>
Wed, 25 Jul 2012 12:33:45 +0000 (14:33 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 25 Jul 2012 12:35:04 +0000 (14:35 +0200)
commit82c62db38b497821381308957fe999e464c40f7e
treeb5b0fb5ab09dc60dee5fc8fd8e980359abbd1b1etree | snapshot
parent5d2d379cc065555e535d3e6d2e9aee4546272c4ccommit | diff
parent7407de2725bcbc7ffb9694458cc6512eb1ec516ecommit | diff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fixes

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 <arnd@arndb.de>
Linux Kernel Source Tree.