]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'msm-urgent' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Jun 2010 16:45:46 +0000 (09:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Jun 2010 16:45:46 +0000 (09:45 -0700)
* 'msm-urgent' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
  mmc: msm: fix compile error on MSM7x30
  msm: dma: add completion.h header


Trivial merge