]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3d55c29 9161c3b)
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)
commit8cef081c71dd4e16a01a1e63cedab21eef8b5735
treeb5b0fb5ab09dc60dee5fc8fd8e980359abbd1b1etree | snapshot
parent3d55c29fb24286f350f04021bef2dd799e25dd20commit | diff
parent9161c3b796a2841a9a7be3d9c9dd121269ce90e8commit | 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 for KaRo TX COM modules