sugar/linux
1
0
Fork 0
Code Activity
Files
2deca7365582b7568dbdd2c3d9eef7ac17d41fd6
linux/drivers
History
Hans de Goede 5f2430f554 watchdog: s3c2410_wdt: Set timeout to actually achieved timeout 
While rebasing my "watchdog_dev: Let the driver update the timeout field on
set_timeout success" patch (before I noticed it was already picked up by Wim),
I noticed that the s3c2410_wdt driver may not always have a 1 second
resolution, this patch changes s3c2410wdt_set_heartbeat to update the
timeout to the actually achieved timeout.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2012-05-23 16:26:20 +02:00
..
accessibility
…
acpi
Merge tag 'driver-core-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-05-22 16:02:13 -07:00
amba
…
ata
…
atm
…
auxdisplay
…
base
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-05-22 18:27:32 -07:00
bcma
…
block
Merge tag 'virtio-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
2012-05-21 20:20:23 -07:00
bluetooth
USB: Disable hub-initiated LPM for comms devices.
2012-05-18 15:42:55 -07:00
cdrom
…
char
Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2012-05-22 16:34:21 -07:00
clk
…
clocksource
…
connector
…
cpufreq
…
cpuidle
…
crypto
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2012-05-21 12:41:17 -07:00
dca
…
devfreq
…
dio
…
dma
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
2012-05-17 09:57:13 -07:00
edac
edac, mips: don't change code that has been removed in edac/mips tree
2012-05-22 11:00:09 +02:00
eisa
…
extcon
Merge tag 'driver-core-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-05-22 16:02:13 -07:00
firewire
…
firmware
…
gpio
Merge tag 'driver-core-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-05-22 16:02:13 -07:00
gpu
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
hid
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
hsi
…
hv
Merge tag 'driver-core-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-05-22 16:02:13 -07:00
hwmon
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
hwspinlock
…
i2c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
ide
…
idle
…
ieee802154
drivers/ieee802154: IEEE 802.15.4 loopback driver
2012-05-16 15:17:08 -04:00
iio
iio: Use dev_to_iio_dev()
2012-05-14 13:37:45 -07:00
infiniband
Merge tag 'rdma-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
2012-05-21 17:54:55 -07:00
input
Merge tag 'usb-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
2012-05-22 15:50:46 -07:00
iommu
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
isdn
Merge tag 'tty-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2012-05-22 16:12:24 -07:00
leds
drivers/leds: correct __devexit annotations
2012-05-10 15:06:44 -07:00
lguest
…
macintosh
…
mca
…
md
Merge tag 'dm-3.4-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm
2012-05-18 18:22:45 -07:00
media
Merge tag 'usb-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
2012-05-22 15:50:46 -07:00
memory
memory: tegra{20,30}-mc: Remove empty *_remove()
2012-05-14 12:52:52 -07:00
memstick
…
message
tokenring: delete all remaining driver support
2012-05-15 20:23:16 -04:00
mfd
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
misc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
mmc
Merge tag 'pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-05-22 09:39:42 -07:00
mtd
Merge tag 'upstream-3.5-rc1' of git://git.infradead.org/linux-ubifs
2012-05-22 19:30:27 -07:00
net
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
nfc
…
nubus
…
of
Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-05-22 09:30:52 -07:00
oprofile
…
parisc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
parport
Merge tag 'driver-core-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-05-22 16:02:13 -07:00
pci
Merge tag 'pci-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2012-05-21 16:24:54 -07:00
pcmcia
…
pinctrl
Merge tag 'pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-05-22 09:39:42 -07:00
platform
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
pnp
…
power
…
pps
…
ps3
…
ptp
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
rapidio
…
regulator
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
remoteproc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
rpmsg
…
rtc
Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-05-22 09:23:24 -07:00
s390
Merge tag 'tty-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2012-05-22 16:12:24 -07:00
sbus
…
scsi
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
sfi
…
sh
…
sn
…
spi
spi/imx: adopt pinctrl support
2012-05-12 09:43:11 +08:00
ssb
…
staging
Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2012-05-22 16:34:21 -07:00
target
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-05-21 17:37:09 -07:00
tc
…
thermal
…
tty
Merge tag 'tty-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2012-05-22 16:12:24 -07:00
uio
uio_pdrv_genirq: get irq through platform resource if not set otherwise
2012-05-15 08:44:58 -07:00
usb
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
uwb
…
vhost
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-16 22:17:37 -04:00
video
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
virt
…
virtio
virtio-mmio: Devices parameter parsing
2012-05-22 12:16:15 +09:30
vlynq
…
vme
…
w1
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
watchdog
watchdog: s3c2410_wdt: Set timeout to actually achieved timeout
2012-05-23 16:26:20 +02:00
xen
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
zorro
…
Kconfig
Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2012-05-22 16:34:21 -07:00
Makefile
Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2012-05-22 16:34:21 -07:00