linux/drivers/watchdog
Linus Torvalds 0df0914d41 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (258 commits)
  omap: zoom: host should not pull up wl1271's irq line
  arm: plat-omap: iommu: fix request_mem_region() error path
  OMAP2+: Common CPU DIE ID reading code reads wrong registers for OMAP4430
  omap4: mux: Remove duplicate mux modes
  omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag
  omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set
  omap2+: mux: Fix compile when CONFIG_OMAP_MUX is not selected
  omap4: board-omap4panda: Initialise the serial pads
  omap3: board-3430sdp: Initialise the serial pads
  omap4: board-4430sdp: Initialise the serial pads
  omap2+: mux: Add macro for configuring static with omap_hwmod_mux_init
  omap2+: mux: Remove the use of IDLE flag
  omap2+: Add separate list for dynamic pads to mux
  perf: add OMAP support for the new power events
  OMAP4: Add IVA OPP enteries.
  OMAP4: Update Voltage Rail Values for MPU, IVA and CORE
  OMAP4: Enable 800 MHz and 1 GHz MPU-OPP
  OMAP3+: OPP: Replace voltage values with Macros
  OMAP3: wdtimer: Fix CORE idle transition
  Watchdog: omap_wdt: add fine grain runtime-pm
  ...

Fix up various conflicts in
 - arch/arm/mach-omap2/board-omap3evm.c
 - arch/arm/mach-omap2/clock3xxx_data.c
 - arch/arm/mach-omap2/usb-musb.c
 - arch/arm/plat-omap/include/plat/usb.h
 - drivers/usb/musb/musb_core.h
2011-03-17 19:28:15 -07:00
..
acquirewdt.c [WATCHDOG] watchdog_info constify 2010-03-07 10:30:57 +00:00
advantechwdt.c [WATCHDOG] watchdog_info constify 2010-03-07 10:30:57 +00:00
adx_wdt.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
alim1535_wdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
alim7101_wdt.c watchdog: convert to DEFINE_PCI_DEVICE_TABLE 2011-03-15 16:02:22 +00:00
ar7_wdt.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
at32ap700x_wdt.c watchdog: at32ap700x_wdt: register misc device last in probe() function 2010-06-17 09:56:57 +00:00
at91rm9200_wdt.c [WATCHDOG] watchdog_info constify 2010-03-07 10:30:57 +00:00
at91sam9_wdt.c [WATCHDOG] Correct WDIOF_MAGICCLOSE flag 2009-06-18 07:30:57 +00:00
ath79_wdt.c watchdog: add driver for the Atheros AR71XX/AR724X/AR913X SoCs 2011-01-12 13:51:29 +00:00
bcm47xx_wdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
bcm63xx_wdt.c watchdog: bcm63xx_wdt: improve platform part. 2010-12-02 14:10:16 +00:00
bfin_wdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
booke_wdt.c watchdog: booke_wdt: clean up status messages 2011-03-15 16:02:39 +00:00
coh901327_wdt.c [WATCHDOG] watchdog_info constify 2010-03-07 10:30:57 +00:00
cpu5wdt.c [WATCHDOG] watchdog_info constify 2010-03-07 10:30:57 +00:00
cpwd.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog 2011-03-17 17:09:29 -07:00
davinci_wdt.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
ep93xx_wdt.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
eurotechwdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
f71808e_wdt.c watchdog: f71808e_wdt: Add Fintek F71869 watchdog 2011-01-12 10:23:04 +00:00
gef_wdt.c dt: Eliminate of_platform_{,un}register_driver 2011-02-28 13:22:46 -07:00
geodewdt.c [WATCHDOG] watchdog_info constify 2010-03-07 10:30:57 +00:00
hpwdt.c watchdog: convert to DEFINE_PCI_DEVICE_TABLE 2011-03-15 16:02:22 +00:00
i6300esb.c watchdog: convert to DEFINE_PCI_DEVICE_TABLE 2011-03-15 16:02:22 +00:00
ib700wdt.c [WATCHDOG] watchdog_info constify 2010-03-07 10:30:57 +00:00
ibmasr.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
imx2_wdt.c watchdog: imx: use clk_get to acquire the watchdog clock 2010-12-14 09:54:19 +01:00
indydog.c [WATCHDOG] watchdog_info constify 2010-03-07 10:30:57 +00:00
intel_scu_watchdog.c watchdog: Intel SCU Watchdog Timer Driver for Moorestown and Medfield platforms. 2011-03-15 16:02:06 +00:00
intel_scu_watchdog.h watchdog: Intel SCU Watchdog Timer Driver for Moorestown and Medfield platforms. 2011-03-15 16:02:06 +00:00
iop_wdt.c [WATCHDOG] sizeof cleanup 2009-09-18 08:39:37 +00:00
it87_wdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
it8712f_wdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
iTCO_vendor_support.c iTCO_wdt: fix TCO V1 timeout values and limits 2010-05-25 09:05:56 +00:00
iTCO_vendor.h [WATCHDOG 18/57] iTCO: unlocked_ioctl, coding style and cleanup 2008-05-28 11:51:32 +00:00
iTCO_wdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
ixp4xx_wdt.c [WATCHDOG] watchdog_info constify 2010-03-07 10:30:57 +00:00
ixp2000_wdt.c [WATCHDOG] watchdog_info constify 2010-03-07 10:30:57 +00:00
jz4740_wdt.c watchdog: jz4740_wdt - fix magic character checking 2011-03-15 16:01:57 +00:00
Kconfig Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog 2011-03-17 17:09:29 -07:00
ks8695_wdt.c watchdog: ks8695_wdt: include mach/hardware.h instead of mach/timex.h. 2011-01-12 10:24:52 +00:00
m54xx_wdt.c m68knommu: Rename m548x_wdt.c to m54xx_wdt.c 2011-02-08 15:07:45 +10:00
machzwd.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
Makefile watchdog: Xen watchdog driver 2011-03-15 16:02:18 +00:00
max63xx_wdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
mixcomwd.c [WATCHDOG] watchdog_info constify 2010-03-07 10:30:57 +00:00
mpc8xxx_wdt.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog 2011-03-17 17:09:29 -07:00
mpcore_wdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
mtx-1_wdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
mv64x60_wdt.c [WATCHDOG] watchdog_info constify 2010-03-07 10:30:57 +00:00
nuc900_wdt.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
nv_tco.c watchdog: convert to DEFINE_PCI_DEVICE_TABLE 2011-03-15 16:02:22 +00:00
nv_tco.h watchdog: Add TCO support for nVidia chipsets 2011-01-12 13:51:23 +00:00
octeon-wdt-main.c WATCHDOG: octeon-wdt: Use I/O clock rate for timing calculations. 2010-10-29 19:08:42 +01:00
octeon-wdt-nmi.S WATCHDOG: Add watchdog driver for OCTEON SOCs 2010-08-05 13:26:22 +01:00
omap_wdt.c Watchdog: omap_wdt: add fine grain runtime-pm 2011-03-10 22:40:05 -07:00
omap_wdt.h watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
orion_wdt.c [ARM] Orion/Kirkwood: rename orion5x_wdt to orion_wdt 2009-06-08 13:05:00 -04:00
pc87413_wdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
pcwd_pci.c watchdog: convert to DEFINE_PCI_DEVICE_TABLE 2011-03-15 16:02:22 +00:00
pcwd_usb.c USB: rename usb_buffer_alloc() and usb_buffer_free() users 2010-05-20 13:21:38 -07:00
pcwd.c [WATCHDOG] watchdog_info constify 2010-03-07 10:30:57 +00:00
pika_wdt.c [WATCHDOG] powerpc: pika_wdt ident cannot be const 2010-04-03 22:22:20 +00:00
pnx833x_wdt.c watchdog: fix several MODULE_PARM_DESC strings 2010-05-25 09:03:52 +00:00
pnx4008_wdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
rc32434_wdt.c [WATCHDOG] watchdog_info constify 2010-03-07 10:30:57 +00:00
rdc321x_wdt.c watchdog: Fix null pointer dereference while accessing rdc321x platform_data 2010-12-22 12:05:21 +01:00
riowd.c dt: Eliminate of_platform_{,un}register_driver 2011-02-28 13:22:46 -07:00
s3c2410_wdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
sa1100_wdt.c [WATCHDOG] SA1100 watchdog maximum timeout 2009-07-09 18:29:38 +00:00
sb_wdog.c watchdog: sb_wdog: release irq and reboot notifier in error path and module_exit() 2010-09-15 18:43:47 +00:00
sbc60xxwdt.c [WATCHDOG] Some more general cleanup 2009-06-18 07:30:30 +00:00
sbc7240_wdt.c [WATCHDOG] Coding style - Indentation - part 2 2008-08-06 13:21:09 +00:00
sbc8360.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
sbc_epx_c3.c [WATCHDOG] Correct WDIOF_MAGICCLOSE flag 2009-06-18 07:30:57 +00:00
sbc_fitpc2_wdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
sc520_wdt.c [WATCHDOG] More coding-style and trivial clean-up 2009-03-25 09:07:04 +00:00
sc1200wdt.c [WATCHDOG] sizeof cleanup 2009-09-18 08:39:37 +00:00
sch311x_wdt.c watchdog: sch311x_wdt: fix printk condition 2011-03-14 10:40:21 +00:00
scx200_wdt.c [WATCHDOG] Correct WDIOF_MAGICCLOSE flag 2009-06-18 07:30:57 +00:00
shwdt.c Merge branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh-latest 2011-01-26 18:24:18 +09:00
smsc37b787_wdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
softdog.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
sp805_wdt.c ARM: amba: make probe() functions take const id tables 2011-02-23 16:24:14 +00:00
sp5100_tco.c watchdog: convert to DEFINE_PCI_DEVICE_TABLE 2011-03-15 16:02:22 +00:00
sp5100_tco.h watchdog: Add support for sp5100 chipset TCO 2011-01-12 13:51:16 +00:00
stmp3xxx_wdt.c [WATCHDOG] watchdog_info constify 2010-03-07 10:30:57 +00:00
ts72xx_wdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
twl4030_wdt.c watchdog: twl4030_wdt: Disable watchdog during probing 2010-05-25 09:05:46 +00:00
txx9wdt.c [WATCHDOG] change reboot_notifier to platform-shutdown method. 2010-03-07 10:30:59 +00:00
w83627hf_wdt.c watchdog: Fix reboot on W83627ehf chipset. 2011-01-12 10:23:52 +00:00
w83697hf_wdt.c [WATCHDOG] Some more general cleanup 2009-06-18 07:30:30 +00:00
w83697ug_wdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
w83877f_wdt.c [WATCHDOG] Coding style - Indentation - part 2 2008-08-06 13:21:09 +00:00
w83977f_wdt.c [WATCHDOG] watchdog_info constify 2010-03-07 10:30:57 +00:00
wafer5823wdt.c [PATCH] Switch all my contributions stuff to a single common address 2008-10-28 19:16:11 +00:00
wd501p.h [WATCHDOG] More coding-style and trivial clean-up 2009-03-25 09:07:04 +00:00
wdrtas.c [WATCHDOG] watchdog_info constify 2010-03-07 10:30:57 +00:00
wdt285.c [PATCH] Switch all my contributions stuff to a single common address 2008-10-28 19:16:11 +00:00
wdt977.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
wdt_pci.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
wdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
wm831x_wdt.c [WATCHDOG] watchdog_info constify 2010-03-07 10:30:57 +00:00
wm8350_wdt.c [PATCH 2/11] drivers/watchdog: Eliminate a NULL pointer dereference 2010-06-07 15:55:03 +00:00
xen_wdt.c watchdog: Xen watchdog driver 2011-03-15 16:02:18 +00:00