Merge branch 'prcm' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...
authorOlof Johansson <olof@lixom.net>
Tue, 20 Dec 2011 05:04:06 +0000 (21:04 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 20 Dec 2011 05:04:06 +0000 (21:04 -0800)

Trivial merge