diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 18:57:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 18:57:04 -0700 |
| commit | c0f62edd400115e54c52692c1dc6f5bf58ea0ba6 (patch) | |
| tree | 6fc905c97653574c71e07bffee33c9a43318d7bb | |
| parent | e4dd65496f6d09cbf4372d69b3b079848fe82ce3 (diff) | |
| parent | 4ee7a6c2d1e8679fc557ee5af1aee96393acb1dc (diff) | |
| parent | 17f52ed7358dc54e5534f9ad495e90306c68cfcf (diff) | |
| download | linux-3.10-c0f62edd400115e54c52692c1dc6f5bf58ea0ba6.tar.gz linux-3.10-c0f62edd400115e54c52692c1dc6f5bf58ea0ba6.tar.bz2 linux-3.10-c0f62edd400115e54c52692c1dc6f5bf58ea0ba6.zip | |
Merge branches 'msm-fixes' and 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
* 'msm-fixes' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
msm: Kconfig: drop unused config options
msm: fix compile failure when no debug uart is selected
msm: fix debug-macro.S build failure
msm: timer: Decrease shift on timer clocksource
arm: mach-msm: fix error handling in msm_iommu_probe()
msm: fix Kconfig target board selection
msm: fix compile failure on struct membank node member
* 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
drivers/video/msm/mddi.c: Remove multiple KERN_<level> uses
drivers: msm: video: add dev_set_name call
drivers: video: msm: fix hang on disable_irq