]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'master' of git://github.com/cyrillos/vm
authorPekka Enberg <penberg@kernel.org>
Thu, 6 Jan 2011 09:58:36 +0000 (11:58 +0200)
committerPekka Enberg <penberg@kernel.org>
Thu, 6 Jan 2011 09:58:36 +0000 (11:58 +0200)

Trivial merge