Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm into...
authorOlof Johansson <olof@lixom.net>
Tue, 17 Jan 2012 06:45:56 +0000 (22:45 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 17 Jan 2012 06:45:56 +0000 (22:45 -0800)
commit916e5ebb9f5a154bb845d555a1a84ef48411b73a
treeac7aa579e926f013bd576c58e79d534f59d52767
parentbbc390a6f275a7405a235b40b00ca0015a5cdb5b
parent5e1a0f9f8d604c21fd72a09b632e3cd9ae66d3a6
Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm into fixes

* 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm:
  ARM: msm: vreg is a module and so needs module.h