Matthew Leach
2cf2ff9f1f
clocksource: arm_global_timer: Only check for unusable timer on A9 ...
The check for a usable global timer in the probe code does not enquire
which CPU we are currently running on. This can cause the driver to
incorrectly assume we have an unusable global timer if we are running
on a CPU other than A9.
Before checking the CPU revision, ensure we are running on an A9 CPU.
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Matthew Leach <matthew.leach@arm.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
2014-04-22 11:44:24 +02:00
Merge branch 'acpi-config'
2014-04-08 21:34:51 +02:00
ARM: SoC: driver changes
2014-04-05 15:37:40 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2014-04-02 16:23:38 -07:00
drivers/base/dd.c incorrect pr_debug() parameters
2014-04-16 19:34:46 -07:00
bcma: gpio: register 32 GPIOs on BCM5357
2014-03-27 14:20:04 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-04-02 20:53:45 -07:00
ARM: SoC: driver changes
2014-04-05 15:37:40 -07:00
TTY/Serial driver fixes for 3.15-rc2
2014-04-18 16:57:53 -07:00
== Changes to existing drivers ==
2014-04-07 10:24:18 -07:00
clocksource: arm_global_timer: Only check for unusable timer on A9
2014-04-22 11:44:24 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-04-02 20:53:45 -07:00
Merge branch 'pm-cpufreq'
2014-04-08 13:28:02 +02:00
Merge branch 'pm-cpuidle'
2014-04-08 13:27:40 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2014-04-03 09:28:16 -07:00
dma: fix eDMA driver as a subsys_initcall
2014-04-16 12:03:47 +05:30
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2014-04-04 09:50:07 -07:00
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-04-11 11:58:33 -07:00
Shiraz has moved
2014-04-18 16:40:08 -07:00
Merge branch 'drm-next-3.15-wip' of git://people.freedesktop.org/~deathsimple/linux into drm-next
2014-04-19 11:16:02 +10:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2014-04-18 10:31:34 -07:00
Drivers: hv: vmbus: Negotiate version 3.0 when running on ws2012r2 hosts
2014-04-16 14:14:07 -07:00
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2014-04-09 08:35:31 -07:00
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2014-04-09 08:45:40 -07:00
Merge branch 'pm-cpuidle'
2014-04-08 13:27:40 +02:00
== Changes to existing drivers ==
2014-04-07 10:24:18 -07:00
InfiniBand/RDMA updates for 3.15-rc2:
2014-04-18 13:49:42 -07:00
pwm: Changes for v3.15-rc1
2014-04-05 18:32:31 -07:00
Merge git://git.infradead.org/iommu-2.6 into iommu/fixes
2014-04-16 16:09:40 +02:00
Shiraz has moved
2014-04-18 16:40:08 -07:00
isdn: icn: buffer overflow in icn_command()
2014-04-16 15:24:15 -04:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2014-04-10 09:06:10 -07:00
drivers/lguest/page_tables.c: rename do_set_pte()
2014-04-07 16:35:52 -07:00
drivers: mcb: fix memory leak in chameleon_parse_cells() error path
2014-04-16 12:28:47 -07:00
One BUG fix for md for recent commit
2014-04-17 10:51:01 -07:00
platform: Fix timberdale dependencies
2014-04-16 11:57:27 +05:30
PCI changes for the v3.15 merge window:
2014-04-01 15:14:04 -07:00
MMC highlights for 3.15:
2014-04-09 08:39:39 -07:00
misc: Grammar s/addition/additional/
2014-04-16 12:28:47 -07:00
MMC highlights for 3.15:
2014-04-09 08:39:39 -07:00
Shiraz has moved
2014-04-18 16:40:08 -07:00
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2014-04-18 18:29:44 -04:00
ntb: Use pci_enable_msix_range() instead of pci_enable_msix()
2014-04-07 10:59:20 -07:00
of: Clean up of_update_property
2014-04-15 15:21:22 -05:00
PCI: tegra: Use new OF interrupt mapping when possible
2014-04-16 10:24:32 -06:00
PCI changes for the v3.15 merge window:
2014-04-01 15:14:04 -07:00
ARM: SoC: driver changes
2014-04-05 15:37:40 -07:00
pinctrl: Rename Broadcom Capri pinctrl driver
2014-04-14 09:39:33 +02:00
alienware-wmi: cover some scenarios where memory allocations would fail
2014-04-10 12:11:56 -04:00
More ACPI and power management updates for 3.15-rc1
2014-04-02 14:10:21 -07:00
CPU hotplug notifiers registration fixes for 3.15-rc1
2014-04-07 14:55:46 -07:00
net: ptp: move PTP classifier in its own file
2014-04-01 16:43:18 -04:00
Shiraz has moved
2014-04-18 16:40:08 -07:00
rapidio: rework device hierarchy and introduce mport class of devices
2014-04-07 16:36:07 -07:00
regulator: Fixes for v3.15
2014-04-11 13:30:05 -07:00
Merge branch 'reset/for_v3.15' of git://git.pengutronix.de/git/pza/linux into next/drivers
2014-03-27 01:28:19 +01:00
ARM: SoC: driver changes
2014-04-05 15:37:40 -07:00
s390/sclp_cmd: replace PTR_RET with PTR_ERR_OR_ZERO
2014-04-11 13:53:42 +02:00
sym53c8xx_2: Set DID_REQUEUE return code when aborting squeue
2014-04-12 18:02:16 -07:00
ARM: SoC: sh driver changes
2014-04-05 15:38:41 -07:00
spi: Fixes for v3.15
2014-04-11 13:35:49 -07:00
staging driver fixes for 3.15-rc2
2014-04-18 16:58:47 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-04-12 17:31:22 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2014-04-10 09:15:46 -07:00
Revert "serial: 8250, disable "too much work" messages"
2014-04-17 09:33:19 -07:00
uas: fix deadlocky memory allocations
2014-04-16 14:04:59 -07:00
uwb: adds missing error handling
2014-04-16 14:03:40 -07:00
VFIO updates for v3.15 include:
2014-04-03 14:05:02 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-04-12 16:51:08 -07:00
video: Kconfig: move drm and fb into separate menus
2014-04-17 08:10:20 +03:00
vme_tsi148: Utilize to_pci_dev() macro
2014-04-16 14:08:37 -07:00
w1: avoid recursive device_add
2014-04-16 14:07:51 -07:00
CPU hotplug notifiers registration fixes for 3.15-rc1
2014-04-07 14:55:46 -07:00
Xen regression and bug fixes for 3.15-rc1.
2014-04-17 10:54:07 -07:00
video: move fbdev to drivers/video/fbdev
2014-04-17 08:10:19 +03:00
2cf2ff9f1f