author | Linus Torvalds <torvalds@linux-foundation.org> | |
Thu, 12 Aug 2010 17:07:32 +0000 (10:07 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Thu, 12 Aug 2010 17:07:32 +0000 (10:07 -0700) |
* 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
msm: mmc: Add msm prefix to platform data structure
msm: trout: Remove extern declaration from source file
arm: msm: Fix section mismatch in smd.c.
arm: msm: trout add mmc support
arm: msm: trout: add trout specific gpio interrupts
arm: msm: remove unused #include <linux/version.h>
msm: mmc: Add msm prefix to platform data structure
msm: trout: Remove extern declaration from source file
arm: msm: Fix section mismatch in smd.c.
arm: msm: trout add mmc support
arm: msm: trout: add trout specific gpio interrupts
arm: msm: remove unused #include <linux/version.h>
1 | 2 | |||
---|---|---|---|---|
arch/arm/mach-msm/acpuclock-arm11.c | patch | | diff1 | | diff2 | | blob | history |
arch/arm/mach-msm/board-trout.c | patch | | diff1 | | diff2 | | blob | history |
drivers/mmc/host/msm_sdcc.c | patch | | diff1 | | diff2 | | blob | history |
drivers/mmc/host/msm_sdcc.h | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arm/mach-msm/acpuclock-arm11.c
Simple merge
diff --cc arch/arm/mach-msm/board-trout.c
Simple merge
diff --cc drivers/mmc/host/msm_sdcc.c
Simple merge
diff --cc drivers/mmc/host/msm_sdcc.h
Simple merge