Merge branch 'msm-urgent' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
commit9aad9c0d939e97c144388630a2d3f6918e61f672
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Jun 2010 16:45:46 +0000 (9 09:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Jun 2010 16:45:46 +0000 (9 09:45 -0700)
tree1ec4b87f49cfe19fc4b8a91622a576f357a6175c
parente411f2dda48c81c556c802d4430717950cf088fd
parentf3d56144c86beb25c7d206efa66d6efba908371c
Merge branch 'msm-urgent' of git://codeaurora.org/quic/kernel/dwalker/linux-msm

* 'msm-urgent' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
  mmc: msm: fix compile error on MSM7x30
  msm: dma: add completion.h header