Maxime Ripard
5df9affb50
clocksource: sun4i: Increase a bit the clock event and sources rating ...
We want to keep this driver as the default provider of the clock events
and source, yet some other driver might fit in the "desired" category of
ratings. Hence, we need to increase a bit the rating so that we can have
more flexibility in the ratings we choose.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Tested-by: Emilio López <emilio@elopez.com.ar>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
2013-12-11 11:07:31 +01:00
Merge branch 'acpica'
2013-11-27 01:03:27 +01:00
ATA: Fix port removal ordering
2013-11-27 13:55:16 -05:00
atm: idt77252: fix dev refcnt leak
2013-11-19 15:53:02 -05:00
More ACPI and power management updates for 3.13-rc1
2013-11-20 13:25:04 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-11-13 17:40:34 +09:00
kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS cleanly
2013-11-21 16:42:27 -08:00
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2013-11-14 08:51:29 +09:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2013-11-23 16:18:25 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-11-15 16:47:22 -08:00
clocksource: sun4i: Increase a bit the clock event and sources rating
2013-12-11 11:07:31 +01:00
connector: improved unaligned access error fix
2013-11-14 17:19:20 -05:00
Merge branch 'pm-cpufreq'
2013-11-27 01:03:43 +01:00
ACPI and power management updates for 3.13-rc1
2013-11-14 13:41:48 +09:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2013-11-23 16:18:25 -08:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-11-20 13:20:24 -08:00
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
2013-11-18 14:51:52 -08:00
tree-wide: use reinit_completion instead of INIT_COMPLETION
2013-11-15 09:32:21 +09:00
Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm
2013-11-14 07:55:21 +09:00
GPIO fixes for the v3.13 series:
2013-11-28 09:57:46 -08:00
drm/qxl: fix memory leak in release list handling
2013-11-29 08:36:15 +10:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2013-11-27 20:41:54 -08:00
Merge branch 'acpica'
2013-11-27 01:03:27 +01:00
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2013-11-29 09:55:13 -08:00
More ACPI and power management updates for 3.13-rc1
2013-11-20 13:25:04 -08:00
Merge branch 'pm-cpuidle'
2013-11-19 01:06:28 +01:00
First round of fixes for IIO in the 3.13 cycle.
2013-11-25 12:50:11 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2013-11-22 10:52:03 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-11-24 10:45:29 -08:00
Don't try to compile shmobile-iommu outside of ARM
2013-11-15 18:57:42 -08:00
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-12-02 10:15:39 -08:00
net: rework recvmsg handler msg_name and msg_namelen logic
2013-11-20 21:52:30 -05:00
leds: pwm: Fix for deferred probe in DT booted mode
2013-12-02 11:53:17 -08:00
powerpc/windfarm: Fix XServe G5 fan control Makefile issue
2013-11-27 11:35:47 +11:00
md/raid5: fix newly-broken locking in get_active_stripe.
2013-11-28 11:00:15 +11:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-11-20 13:20:24 -08:00
tree-wide: use reinit_completion instead of INIT_COMPLETION
2013-11-15 09:32:21 +09:00
drivers/message/i2o/driver.c: add missing destroy_workqueue() on error in i2o_driver_register()
2013-11-13 12:09:26 +09:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-11-15 16:47:22 -08:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-11-20 13:20:24 -08:00
More ACPI and power management updates for 3.13-rc1
2013-11-20 13:25:04 -08:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-11-20 13:20:24 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-12-02 10:09:07 -08:00
NTB driver bug fixes to address a missed call to pci_enable_msix,
2013-11-26 11:15:12 -08:00
Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm
2013-11-14 07:55:21 +09:00
Kconfig cleanups for v3.13
2013-11-15 14:05:15 -08:00
remove obsolete references to powertweak
2013-11-27 20:34:32 -08:00
DeviceTree updates for 3.13. This is a bit larger pull request than
2013-11-12 16:52:17 +09:00
pinctrl: single: call pcs_soc->rearm() whenever IRQ mask is changed
2013-11-14 10:43:17 -08:00
sony-laptop: do not scribble keyboard backlight registers on resume
2013-11-26 13:03:36 +09:00
ACPI: Eliminate the DEVICE_ACPI_HANDLE() macro
2013-11-14 23:17:21 +01:00
Highlights:
2013-11-18 15:35:09 -08:00
drivers/pps/clients/pps-gpio.c: remove redundant of_match_ptr
2013-11-13 12:09:35 +09:00
Merge remote-tracking branch 'regulator/fix/pfuze100' into regulator-linus
2013-11-24 14:02:50 +00:00
ARM: drivers/rtc/rtc-at91rm9200.c: disable interrupts at shutdown
2013-11-21 16:42:27 -08:00
s390/dasd: validate request size before building CCW/TCW request
2013-11-20 09:04:54 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-12-02 10:09:07 -08:00
Merge remote-tracking branches 'spi/fix/bcm2835', 'spi/fix/bcm63xx', 'spi/fix/mpc512x-psc', 'spi/fix/mxs', 'spi/fix/pxa2xx', 'spi/fix/qspi', 'spi/fix/rspi' and 'spi/fix/txx9' into spi-linus
2013-11-28 11:31:35 +00:00
Staging: tidspbridge: disable driver
2013-11-27 09:32:49 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2013-11-22 10:52:03 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-11-19 15:50:47 -08:00
Revert "n_gsm: race between ld close and gsmtty open"
2013-11-25 18:30:21 -08:00
uio: we cannot mmap unaligned page contents
2013-12-02 11:50:37 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2013-11-22 10:52:03 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2013-11-22 10:52:03 -08:00
ARM: SoC fixes for 3.13 merge window
2013-11-16 12:45:55 -08:00
Nothing really exciting: some groundwork for changing virtio endian, and
2013-11-15 13:28:47 +09:00
drivers/w1/masters/w1-gpio.c: use dev_get_platdata()
2013-11-15 09:32:21 +09:00
watchdog: w83627hf: Use helper functions to access superio registers
2013-11-18 21:34:19 +01:00
Bug-fixes:
2013-12-02 10:12:01 -08:00
ACPI and power management updates for 3.13-rc1
2013-11-14 13:41:48 +09:00
ACPI and power management updates for 3.13-rc1
2013-11-14 13:41:48 +09:00
5df9affb50