diff options
| author | Mathieu J. Poirier <mathieu.poirier@linaro.org> | 2011-09-29 15:10:39 -0600 |
|---|---|---|
| committer | Mathieu J. Poirier <mathieu.poirier@linaro.org> | 2011-09-29 15:10:39 -0600 |
| commit | 7118ded1c4dbdee31da6876b1839a1b647bc41df (patch) | |
| tree | cf926790ce9fe3bb3b35baef5a9b7289e519cade /arch/arm/mach-ux500/headsmp.S | |
| parent | 0023ca51966eb6e302f3cb945dbff9e794be615f (diff) | |
| parent | 2036fd76350799bb2b53b309d0ac6d60692fe890 (diff) | |
| download | snowball-7118ded1c4dbdee31da6876b1839a1b647bc41df.tar.gz | |
Merge branch 'linaro.linux-3.0-android-ux500.master' into linux-linaro-3.0-2011.09-0-android-1
Signed-off-by: Mathieu J. Poirier <mathieu.poirier@linaro.org>
Conflicts:
arch/arm/common/Makefile
arch/arm/configs/android_omap3_defconfig
arch/arm/configs/android_omap4_defconfig
arch/arm/kernel/entry-armv.S
drivers/gpu/ion/ion.c
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/mmc/card/block.c
drivers/mmc/core/core.c
drivers/mmc/host/mmci.c
drivers/net/wireless/bcmdhd/Makefile
drivers/net/wireless/bcmdhd/bcmevent.c
drivers/net/wireless/bcmdhd/bcmsdh_linux.c
drivers/net/wireless/bcmdhd/dhd.h
drivers/net/wireless/bcmdhd/dhd_bus.h
drivers/net/wireless/bcmdhd/dhd_cdc.c
drivers/net/wireless/bcmdhd/dhd_common.c
drivers/net/wireless/bcmdhd/dhd_linux.c
drivers/net/wireless/bcmdhd/dhd_linux_mon.c
drivers/net/wireless/bcmdhd/dhd_sdio.c
drivers/net/wireless/bcmdhd/include/bcmutils.h
drivers/net/wireless/bcmdhd/include/epivers.h
drivers/net/wireless/bcmdhd/include/linuxver.h
drivers/net/wireless/bcmdhd/include/proto/bcmevent.h
drivers/net/wireless/bcmdhd/include/sdio.h
drivers/net/wireless/bcmdhd/include/wlioctl.h
drivers/net/wireless/bcmdhd/wl_android.c
drivers/net/wireless/bcmdhd/wl_android.h
drivers/net/wireless/bcmdhd/wl_cfg80211.c
drivers/net/wireless/bcmdhd/wl_cfg80211.h
drivers/net/wireless/bcmdhd/wl_cfgp2p.c
drivers/net/wireless/bcmdhd/wl_cfgp2p.h
drivers/net/wireless/bcmdhd/wl_iw.c
drivers/net/wireless/bcmdhd/wldev_common.c
drivers/staging/android/Kconfig
drivers/staging/android/Makefile
drivers/staging/android/binder.c
drivers/staging/android/logger.c
drivers/usb/gadget/android.c
drivers/usb/otg/otg_id.c
include/linux/android_aid.h
include/linux/earlysuspend.h
include/linux/ion.h
include/linux/usb/otg_id.h
include/linux/wakelock.h
kernel/irq/pm.c
kernel/power/consoleearlysuspend.c
kernel/power/wakelock.c
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c
net/netfilter/Kconfig
net/netfilter/xt_qtaguid.c
net/netfilter/xt_quota2.c
Diffstat (limited to 'arch/arm/mach-ux500/headsmp.S')
| -rw-r--r-- | arch/arm/mach-ux500/headsmp.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/headsmp.S b/arch/arm/mach-ux500/headsmp.S index 64fa451edcf..a6be2cdf2b2 100644 --- a/arch/arm/mach-ux500/headsmp.S +++ b/arch/arm/mach-ux500/headsmp.S @@ -23,6 +23,7 @@ ENTRY(u8500_secondary_startup) ldmia r4, {r5, r6} sub r4, r4, r5 add r6, r6, r4 + dsb pen: ldr r7, [r6] cmp r7, r0 bne pen |