original_kernel/drivers/watchdog
Linus Torvalds 7115e3fcf4 Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (121 commits)
  perf symbols: Increase symbol KSYM_NAME_LEN size
  perf hists browser: Refuse 'a' hotkey on non symbolic views
  perf ui browser: Use libslang to read keys
  perf tools: Fix tracing info recording
  perf hists browser: Elide DSO column when it is set to just one DSO, ditto for threads
  perf hists: Don't consider filtered entries when calculating column widths
  perf hists: Don't decay total_period for filtered entries
  perf hists browser: Honour symbol_conf.show_{nr_samples,total_period}
  perf hists browser: Do not exit on tab key with single event
  perf annotate browser: Don't change selection line when returning from callq
  perf tools: handle endianness of feature bitmap
  perf tools: Add prelink suggestion to dso update message
  perf script: Fix unknown feature comment
  perf hists browser: Apply the dso and thread filters when merging new batches
  perf hists: Move the dso and thread filters from hist_browser
  perf ui browser: Honour the xterm colors
  perf top tui: Give color hints just on the percentage, like on --stdio
  perf ui browser: Make the colors configurable and change the defaults
  perf tui: Remove unneeded call to newtCls on startup
  perf hists: Don't format the percentage on hist_entry__snprintf
  ...

Fix up conflicts in arch/x86/kernel/kprobes.c manually.

Ingo's tree did the insane "add volatile to const array", which just
doesn't make sense ("volatile const"?).  But we could remove the const
*and* make the array volatile to make doubly sure that gcc doesn't
optimize it away..

Also fix up kernel/trace/ring_buffer.c non-data-conflicts manually: the
reader_lock has been turned into a raw lock by the core locking merge,
and there was a new user of it introduced in this perf core merge.  Make
sure that new use also uses the raw accessor functions.
2011-10-26 17:03:38 +02:00
..
Kconfig
Makefile
acquirewdt.c
advantechwdt.c
adx_wdt.c
alim1535_wdt.c
alim7101_wdt.c
ar7_wdt.c
at32ap700x_wdt.c
at91rm9200_wdt.c
at91sam9_wdt.c
at91sam9_wdt.h
ath79_wdt.c
bcm47xx_wdt.c
bcm63xx_wdt.c
bfin_wdt.c
booke_wdt.c
coh901327_wdt.c
cpu5wdt.c
cpwd.c
davinci_wdt.c
dw_wdt.c
ep93xx_wdt.c
eurotechwdt.c
f71808e_wdt.c
gef_wdt.c
geodewdt.c
hpwdt.c x86, nmi, drivers: Fix nmi splitup build bug 2011-10-10 06:57:21 +02:00
i6300esb.c
iTCO_vendor.h
iTCO_vendor_support.c
iTCO_wdt.c
ib700wdt.c
ibmasr.c
imx2_wdt.c
indydog.c
intel_scu_watchdog.c
intel_scu_watchdog.h
iop_wdt.c
it87_wdt.c
it8712f_wdt.c
ixp4xx_wdt.c
ixp2000_wdt.c
jz4740_wdt.c
ks8695_wdt.c
lantiq_wdt.c watchdog: lantiq: fix watchdogs timeout handling 2011-09-20 14:28:24 +02:00
m54xx_wdt.c
machzwd.c
max63xx_wdt.c
mixcomwd.c
mpc8xxx_wdt.c
mpcore_wdt.c
mtx-1_wdt.c
mv64x60_wdt.c
nuc900_wdt.c
nv_tco.c
nv_tco.h
octeon-wdt-main.c
octeon-wdt-nmi.S
of_xilinx_wdt.c
omap_wdt.c
omap_wdt.h
orion_wdt.c
pc87413_wdt.c
pcwd.c
pcwd_pci.c
pcwd_usb.c
pika_wdt.c
pnx833x_wdt.c
pnx4008_wdt.c
rc32434_wdt.c
rdc321x_wdt.c
riowd.c
s3c2410_wdt.c
sa1100_wdt.c
sb_wdog.c
sbc60xxwdt.c
sbc7240_wdt.c
sbc8360.c
sbc_epx_c3.c watchdog: Initconst section fixes for watchdog 2011-09-20 14:32:00 +02:00
sbc_fitpc2_wdt.c
sc520_wdt.c
sc1200wdt.c
sch311x_wdt.c
scx200_wdt.c
shwdt.c
smsc37b787_wdt.c doc: fix broken references 2011-09-27 18:08:04 +02:00
softdog.c
sp805_wdt.c
sp5100_tco.c
sp5100_tco.h
stmp3xxx_wdt.c
ts72xx_wdt.c
twl4030_wdt.c
txx9wdt.c
w83627hf_wdt.c
w83697hf_wdt.c
w83697ug_wdt.c
w83877f_wdt.c
w83977f_wdt.c
wafer5823wdt.c
watchdog_core.c
watchdog_dev.c watchdog: WatchDog Timer Driver Core - use passed watchdog_device 2011-09-20 14:22:28 +02:00
watchdog_dev.h
wd501p.h
wdrtas.c
wdt.c
wdt285.c
wdt977.c
wdt_pci.c
wm831x_wdt.c
wm8350_wdt.c
xen_wdt.c