Magnus Damm
3f7e5e2423
clocksource: sh_cmt: wait for CMCNT on init V2 ...
Add code to the CMT driver to wait for CMCNT V2. This to let
the register value settle before starting the timer channel.
Makes the driver more robust.
Needed for CMT2 on sh7372 and certain CMT channels on sh73a0.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2011-07-21 16:16:51 +09:00
Merge branches 'd3cold', 'bugzilla-37412' and 'bugzilla-38152' into release
2011-07-14 00:16:38 -04:00
ARM: 6829/1: amba: make hardcoded periphid override hardware
2011-05-26 10:33:34 +01:00
ahci: change 'masking port_map' printk to KERN_WARNING level
2011-06-29 10:10:07 -07:00
mm: Move definition of MIN_MEMORY_BLOCK_SIZE to a header
2011-07-12 11:08:01 +10:00
drivers/bcma/host_pci.c needs slab.h
2011-05-26 17:12:32 -07:00
Merge branch 'for-3.0-important' of git://git.drbd.org/linux-2.6-drbd into for-linus
2011-06-30 10:10:50 +02:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem
2011-06-17 12:40:36 -04:00
block: fix mismerge of the DISK_EVENT_MEDIA_CHANGE removal
2011-06-02 05:29:19 +09:00
agp/intel: Fix typo in G4x_GMCH_SIZE_VT_2M
2011-07-13 07:44:27 +01:00
clocksource: sh_cmt: wait for CMCNT on init V2
2011-07-21 16:16:51 +09:00
Connector: Correctly set the error code in case of success when dispatching receive callbacks
2011-06-07 12:02:00 -07:00
[CPUFREQ] fix cpumask memory leak in acpi-cpufreq on cpu hotplug.
2011-07-10 17:03:04 -04:00
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
2011-05-29 11:18:09 -07:00
crypto: caam - fix operator precedence in shared descriptor allocation
2011-06-30 07:43:27 +08:00
dmaengine: shdma: SH_DMAC_MAX_CHANNELS message fix
2011-06-14 15:03:07 +09:00
edac,rcu: use synchronize_rcu() instead of call_rcu()+rcu_barrier()
2011-05-26 17:12:37 -07:00
firewire: ohci: do not bind to Pinnacle cards, avert panic
2011-07-10 12:53:27 +02:00
Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2011-06-28 11:15:36 -07:00
gpio: wm831x: add a missing break in wm831x_gpio_dbg_show
2011-07-15 14:03:30 -06:00
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
2011-07-13 14:04:26 -07:00
HID: hid-multitouch: add support for a new Lumio dual-touch panel
2011-06-24 13:41:11 +02:00
hwmon: (max1111) Fix race condition causing NULL pointer exception
2011-07-17 18:39:19 +02:00
Merge branch 'for-30-rc5/all-i2c' of git://git.fluff.org/bjdooks/linux
2011-07-07 16:29:29 -07:00
ide-cd: signedness warning fix again
2011-06-11 15:06:48 -07:00
RDMA: Check for NULL mode in .devnode methods
2011-07-04 15:53:28 -07:00
input: pmic8xxx-pwrkey: Do not use mfd_get_data()
2011-07-05 10:38:43 +02:00
gigaset: call module_put before restart of if_open()
2011-06-17 15:27:32 -04:00
drivers/leds/leds-pca9532.c: change driver name to be unique
2011-07-08 21:14:44 -07:00
md: avoid endless recovery loop when waiting for fail device to complete.
2011-06-28 16:59:42 +10:00
si4713-i2c: avoid potential buffer overflow on si4713
2011-07-18 09:12:21 -07:00
w1: ds1wm: add a reset recovery parameter
2011-07-08 21:14:44 -07:00
Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2011-06-28 11:15:36 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
2011-07-13 16:47:31 -07:00
powerpc/85xx: fix NAND_CMD_READID read bytes number
2011-06-22 06:08:48 -05:00
pppoe: Must flush connections when MAC address changes too.
2011-07-18 11:48:28 -07:00
oprofile: Fix locking dependency in sync_start()
2011-05-31 16:33:34 +02:00
Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
2011-05-26 13:19:00 -07:00
PCI: conditional resource-reallocation through kernel parameter pci=realloc
2011-07-08 15:49:20 -07:00
pcmcia: pxa2xx/vpac270: free gpios on exist rather than requesting
2011-07-11 14:26:34 +08:00
hp-wmi: fix use after free
2011-07-11 09:52:35 -04:00
Merge git://git.infradead.org/battery-2.6
2011-05-27 10:12:35 -07:00
ptp: Fix some locking bugs in ptp_read()
2011-06-01 19:29:10 -07:00
regulator: max8997: Fix setting inappropriate value for ramp_delay variable
2011-07-08 19:14:58 +01:00
drivers/rtc/rtc-ds1307.c: add support for RTC device pt7c4338
2011-06-27 18:00:12 -07:00
[S390] qdio: Split SBAL entry flags
2011-06-06 14:14:56 +02:00
[SCSI] isci: fix checkpatch errors
2011-07-03 14:26:24 -05:00
drivers: sh: resume enabled clocks fix
2011-06-14 15:15:25 +09:00
spi/s3c64xx: Bug fix for SPI with different FIFO level
2011-07-06 15:03:08 +09:00
ssb: fix init regression of hostmode PCI core
2011-07-07 13:06:08 -04:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
2011-07-06 12:16:49 -07:00
tcm_fc: Fix conversion spec warning
2011-06-24 00:09:16 +00:00
Merge branch 'at91/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-2.6-arm-soc
2011-07-04 15:54:18 -07:00
USB: additional regression fix for device removal
2011-07-07 13:29:33 -07:00
vhost: support event index
2011-05-30 11:14:15 +09:30
vesafb: fix memory leak
2011-07-04 16:02:48 +09:00
virtio: add api for delayed callbacks
2011-05-30 11:14:16 +09:30
w1: ds1wm: add a reset recovery parameter
2011-07-08 21:14:44 -07:00
watchdog: hpwdt depends on PCI
2011-07-17 12:40:08 +00:00
Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2011-06-20 09:01:33 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
2011-05-28 12:35:15 -07:00
3f7e5e2423