Merge branch 'msm-urgent' of git://codeaurora.org/quic/kernel/dwalker/linux-msm

Browse source

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

...

This commit is contained in:

Linus Torvalds 2010-06-09 09:45:46 -07:00

parent e411f2dda4 f3d56144c8

commit 9aad9c0d93

2 changed files with 2 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/arm/mach-msm/dma.c

View file

2

drivers/mmc/host/Kconfig

View file