kernel-ark/drivers/watchdog
Linus Torvalds e16b396ce3 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)
  doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
  Update cpuset info & webiste for cgroups
  dcdbas: force SMI to happen when expected
  arch/arm/Kconfig: remove one to many l's in the word.
  asm-generic/user.h: Fix spelling in comment
  drm: fix printk typo 'sracth'
  Remove one to many n's in a word
  Documentation/filesystems/romfs.txt: fixing link to genromfs
  drivers:scsi Change printk typo initate -> initiate
  serial, pch uart: Remove duplicate inclusion of linux/pci.h header
  fs/eventpoll.c: fix spelling
  mm: Fix out-of-date comments which refers non-existent functions
  drm: Fix printk typo 'failled'
  coh901318.c: Change initate to initiate.
  mbox-db5500.c Change initate to initiate.
  edac: correct i82975x error-info reported
  edac: correct i82975x mci initialisation
  edac: correct commented info
  fs: update comments to point correct document
  target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
  ...

Trivial conflict in fs/eventpoll.c (spelling vs addition)
2011-03-18 10:37:40 -07:00
..
acquirewdt.c
advantechwdt.c
adx_wdt.c
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
at32ap700x_wdt.c
at91rm9200_wdt.c
at91sam9_wdt.c
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
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
cpu5wdt.c
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
ep93xx_wdt.c
eurotechwdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
f71808e_wdt.c
gef_wdt.c dt: Eliminate of_platform_{,un}register_driver 2011-02-28 13:22:46 -07:00
geodewdt.c
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
ibmasr.c
imx2_wdt.c
indydog.c
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
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_vendor.h
iTCO_wdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
ixp4xx_wdt.c
ixp2000_wdt.c
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
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
nuc900_wdt.c
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
octeon-wdt-nmi.S
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
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
pcwd.c
pika_wdt.c
pnx833x_wdt.c
pnx4008_wdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
rc32434_wdt.c
rdc321x_wdt.c
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
sb_wdog.c
sbc60xxwdt.c
sbc7240_wdt.c
sbc8360.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
sbc_epx_c3.c Remove one to many n's in a word 2011-03-01 15:47:58 +01:00
sbc_fitpc2_wdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
sc520_wdt.c
sc1200wdt.c
sch311x_wdt.c watchdog: sch311x_wdt: fix printk condition 2011-03-14 10:40:21 +00:00
scx200_wdt.c
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
ts72xx_wdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
twl4030_wdt.c
txx9wdt.c
w83627hf_wdt.c
w83697hf_wdt.c
w83697ug_wdt.c watchdog: cleanup spaces before tabs 2011-03-15 16:02:27 +00:00
w83877f_wdt.c
w83977f_wdt.c
wafer5823wdt.c
wd501p.h
wdrtas.c
wdt285.c
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
wm8350_wdt.c
xen_wdt.c watchdog: Xen watchdog driver 2011-03-15 16:02:18 +00:00