Linus Torvalds 750f77064a Merge git://www.linux-watchdog.org/linux-watchdog ... Pull watchdog updates from Wim Van Sebroeck: - Removal of the Documentation/watchdog/00-INDEX file - Fix boot status reporting for imx2_wdt - clean-up sp805_wdt, pnx4008_wdt and mpcore_wdt - convert printk in watchdog drivers to pr_ functions - change nowayout module parameter to bool for every watchdog device - conversion of jz4740_wdt, pnx4008_wdt, max63xx_wdt, softdog, ep93xx_wdt, coh901327 and txx9wdt to new watchdog API - Add support for the WDIOC_GETTIMELEFT ioctl call to the new watchdog API - Change the new watchdog API so that the driver updates the timeout value - two fixes for the xen_wdt driver Fix up conflicts in ep93xx driver due to the same patches being merged through separate branches. * git://www.linux-watchdog.org/linux-watchdog: (33 commits) watchdog: txx9wdt: fix timeout watchdog: Convert txx9wdt driver to watchdog framework watchdog: coh901327_wdt.c: fix timeout watchdog: coh901327: convert to use watchdog core watchdog: Add support for WDIOC_GETTIMELEFT IOCTL in watchdog core watchdog: ep93xx_wdt: timeout is an unsigned int value. watchdog: ep93xx_wdt: Fix timeout after conversion to watchdog core watchdog: Convert ep93xx driver to watchdog core watchdog: sp805: Use devm routines watchdog: sp805: replace readl/writel with lighter _relaxed variants watchdog: sp805: Fix documentation style comment watchdog: mpcore_wdt: Allow platform_get_irq() to fail watchdog: mpcore_wdt: Use devm routines watchdog: mpcore_wdt: Rename dev to pdev for pointing to struct platform_device watchdog: xen: don't clear is_active when xen_wdt_stop() failed watchdog: xen: don't unconditionally enable the watchdog during resume watchdog: fix compiler error for missing parenthesis watchdog: ep93xx_wdt.c: fix platform probe watchdog: ep93xx: Convert the watchdog driver into a platform device. watchdog: fix set_timeout operations ...		2012-03-28 13:03:26 -07:00
..
ABI	Device-mapper changes for 3.4.	2012-03-28 12:55:04 -07:00
accounting
acpi	acpi/apei/einj: Add extensions to EINJ from rev 5.0 of acpi spec	2012-01-18 01:14:17 -05:00
aoe
arm	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
auxdisplay
backlight	backlight: new backlight driver for LP855x devices	2012-03-23 16:58:33 -07:00
blackfin	doc: fix broken references	2011-09-27 18:08:04 +02:00
block	Documentation: drop as block elevator reference in switching-sched.txt	2011-11-04 12:01:48 -07:00
blockdev	cciss: auto engage SCSI mid layer at driver load time	2011-11-16 09:21:49 +01:00
cdrom	doc: fix broken references	2011-09-27 18:08:04 +02:00
cgroups	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
connector
console
cpu-freq	Doc: cpufreq: Fix typo and outdated line	2011-11-08 10:23:29 +01:00
cpuidle
cris
crypto
development-process	Documentation: Update stable address	2011-12-12 14:14:31 -08:00
device-mapper	dm: add verity target	2012-03-28 18:43:38 +01:00
devicetree	ARM: More device tree support updates	2012-03-28 12:34:33 -07:00
DocBook	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-03-23 14:39:09 -07:00
driver-model	Merge remote-tracking branches 'regulator/topic/devm' and 'regulator/topic/stub' into regulator-next	2012-03-18 21:38:28 +00:00
dvb	[media] lmedm04 RS2000 Firmware details	2012-03-19 14:55:55 -03:00
early-userspace
EDID	drm: allow loading an EDID as firmware to override broken monitor	2012-03-20 10:09:28 +00:00
fault-injection	fault-injection: update documentation with the mmc module param	2011-10-26 16:32:13 -04:00
fb	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
filesystems	Ext4 commits for 3.3 merge window; mostly cleanups and bug fixes	2012-03-28 10:02:55 -07:00
firmware_class
frv	doc: fix broken references	2011-09-27 18:08:04 +02:00
hid
hwmon	hwmon: Add MCP3021 ADC driver	2012-03-23 10:02:20 +01:00
i2c	USB: ohci-nxp: Rename symbols from pnx4008 to nxp	2012-03-13 14:27:28 -07:00
i2o	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
ia64
ide	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
infiniband
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
ioctl	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-03-21 13:36:41 -07:00
isdn
ja_JP	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6	2011-07-25 23:06:24 -07:00
kbuild	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
kdump	[S390] Add s390x description to Documentation/kdump/kdump.txt	2011-12-27 11:27:13 +01:00
ko_KR	driver-core: documentation: fix up Greg's email address	2012-02-15 14:48:01 -08:00
laptops	Documentation: thinkpad-acpi grammo fixes	2011-11-04 12:01:47 -07:00
leds	drivers/leds/leds-lp5521.c: support led pattern data	2012-03-23 16:58:34 -07:00
m68k	Documentation: add pointer to name_to_dev_t for root= values	2011-08-03 14:25:21 -10:00
make
mips
misc-devices
mmc	mmc: core: Fixup delayed work clock gating patch	2012-01-11 23:58:43 -05:00
mn10300
mtd
namespaces
netlabel
networking	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-03-21 13:25:04 -07:00
nfc
parisc
PCI	doc: fix broken references	2011-09-27 18:08:04 +02:00
pcmcia
power	PM / Freezer / Docs: Document the beauty of freeze/thaw semantics	2012-02-09 23:55:49 +01:00
powerpc	Documentation/powerpc/mpc52xx.txt: Checkpatch cleanup	2012-03-18 23:59:34 +01:00
pps
prctl
pti
ptp
rapidio	RapidIO: documentation update	2011-11-02 16:07:02 -07:00
RCU	rcu: Call out dangers of expedited RCU primitives	2012-02-21 09:06:08 -08:00
s390	[S390] Remove Kerntypes leftovers	2011-12-27 11:27:12 +01:00
scheduler	sched: Remove sched_switch	2012-01-27 13:28:53 +01:00
scsi	SCSI updates on 20120319	2012-03-22 12:55:29 -07:00
security	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-03-21 13:25:04 -07:00
serial	serial/documentation: fix documented name of DCD cpp symbol	2012-01-04 16:26:32 -08:00
sh
sound	Updates of sound stuff for 3.4-rc1	2012-03-22 13:00:13 -07:00
sparc
spi	spi: create a message queueing infrastructure	2012-03-07 19:19:48 -07:00
sysctl	Documentation: add missing tainted bits to Documentation/sysctl/kernel.txt	2012-02-06 16:29:19 -08:00
target	Documentation: Fix typo in tcm_mod_builder.py	2012-02-10 09:52:18 +01:00
telephony
thermal	thermal: Rename generate_netlink_event	2012-01-23 03:15:25 -05:00
timers	doc: fix broken references	2011-09-27 18:08:04 +02:00
trace	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
usb	Documentation: Fix Broken URL "freshmeat"	2012-02-21 11:43:45 +01:00
vDSO
video4linux	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-03-23 14:39:09 -07:00
virtual	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
vm	Cleanups: rename of flush to invalidate, moving reporting of statistics	2012-03-22 19:52:47 -07:00
w1
watchdog	watchdog: Add support for WDIOC_GETTIMELEFT IOCTL in watchdog core	2012-03-27 20:15:37 +02:00
wimax
x86	x86-64, doc: Remove int 0xcc from entry_64.S documentation	2011-08-16 08:04:08 -07:00
zh_CN	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-03-20 21:04:47 -07:00
.gitignore
00-INDEX	crc32: move long comment about crc32 fundamentals to Documentation/	2012-03-23 16:58:37 -07:00
applying-patches.txt
atomic_ops.txt	doc: Add load/store guarantees to Documentation/atomic-ops.txt	2011-12-11 10:31:58 -08:00
bad_memory.txt
basic_profiling.txt
binfmt_misc.txt
braille-console.txt
bt8xxgpio.txt
btmrvl.txt
BUG-HUNTING
bus-virt-phys-mapping.txt	doc: fix broken references	2011-09-27 18:08:04 +02:00
cachetlb.txt
Changes
circular-buffers.txt
clk.txt	Documentation: common clk API	2012-03-16 20:35:01 +00:00
coccinelle.txt	coccinelle.txt: update documentation to include M= option	2012-01-14 22:25:56 +01:00
CodingStyle	Documentation: update CodingStyle use of braces	2011-11-04 12:01:47 -07:00
cpu-hotplug.txt
cpu-load.txt
cputopology.txt
crc32.txt	crc32: move long comment about crc32 fundamentals to Documentation/	2012-03-23 16:58:37 -07:00
dcdbas.txt
debugging-modules.txt
debugging-via-ohci1394.txt
dell_rbu.txt
devices.txt	vhost-net: add module alias (v2.1)	2012-01-13 10:12:23 -08:00
digsig.txt	crypto: digital signature verification support	2011-11-09 12:10:37 +02:00
DMA-API-HOWTO.txt	Documentation/DMA-API-HOWTO.txt: fix misleading example	2011-07-26 16:49:45 -07:00
DMA-API.txt	include/linux/dma-mapping.h: add dma_zalloc_coherent()	2011-11-02 16:07:02 -07:00
DMA-attributes.txt
dma-buf-sharing.txt	dma-buf: Documentation update for Kconfig select	2012-01-13 10:27:33 +00:00
DMA-ISA-LPC.txt
dmaengine.txt	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
dontdiff	[S390] Remove Kerntypes leftovers	2011-12-27 11:27:12 +01:00
dynamic-debug-howto.txt	dynamic_debug: process multiple debug-queries on a line	2012-01-24 12:50:36 -08:00
edac.txt	EDAC: Correct scrub rate API	2012-03-19 12:03:58 +01:00
eisa.txt
email-clients.txt	Documentation: email-clients: Add better Thunderbird information	2011-08-13 18:34:03 -07:00
feature-removal-schedule.txt	ARM: global cleanups	2012-03-27 16:03:32 -07:00
flexible-arrays.txt
futex-requeue-pi.txt
gcov.txt
gpio.txt
highuid.txt
HOWTO	Documentation: Update stable address	2011-12-12 14:14:31 -08:00
hw_random.txt
hwspinlock.txt	hwspinlock/core: register a bank of hwspinlocks in a single API call	2011-09-21 19:45:34 +03:00
init.txt
initrd.txt
intel_txt.txt
Intel-IOMMU.txt
io_ordering.txt
io-mapping.txt
iostats.txt
IPMI.txt
IRQ-affinity.txt
IRQ-domain.txt	irq_domain: add documentation and MAINTAINERS entry.	2012-02-14 14:06:47 -07:00
IRQ.txt
irqflags-tracing.txt
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt
kernel-docs.txt	doc: fix broken references	2011-09-27 18:08:04 +02:00
kernel-parameters.txt	Miscellaneous Itanium patches	2012-03-23 17:19:37 -07:00
kmemcheck.txt
kmemleak.txt	kmemleak: Handle percpu memory allocation	2011-12-02 16:12:42 +00:00
kobject.txt	driver-core: documentation: fix up Greg's email address	2012-02-15 14:48:01 -08:00
kprobes.txt
kref.txt
ldm.txt
local_ops.txt
lockdep-design.txt	lockdep: Update documentation for lock-class leak detection	2011-12-11 10:31:23 -08:00
lockstat.txt
lockup-watchdogs.txt	watchdog: Update documentation	2012-02-11 15:11:28 +01:00
logo.gif
logo.txt
magic-number.txt	drivers/net: fix up stale paths from driver reorg	2012-01-30 12:54:40 -05:00
Makefile
ManagementStyle
mca.txt
md.txt	md: create externally visible flags for supporting hot-replace.	2011-12-23 10:17:51 +11:00
media-framework.txt	doc: fix broken references	2011-09-27 18:08:04 +02:00
memory-barriers.txt	doc: fix broken references	2011-09-27 18:08:04 +02:00
memory-hotplug.txt
memory.txt
mono.txt
mutex-design.txt
nommu-mmap.txt
numastat.txt	Doc: Update numastat.txt	2012-02-28 16:05:06 +01:00
oops-tracing.txt	module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree	2011-11-07 07:54:42 +10:30
padata.txt
parport-lowlevel.txt
parport.txt
pi-futex.txt
pinctrl.txt	pinctrl: enhance mapping table to support pin config operations	2012-03-05 11:25:11 +01:00
pnp.txt
preempt-locking.txt
printk-formats.txt
prio_tree.txt
ramoops.txt	Documentation: add Ramoops usage description	2011-08-13 18:34:03 -07:00
rbtree.txt	Documentation: Update augmented rbtree documentation	2011-07-24 10:03:05 -07:00
remoteproc.txt	remoteproc: remove the single rpmsg vdev limitation	2012-03-06 19:14:12 +02:00
rfkill.txt	doc: fix broken references	2011-09-27 18:08:04 +02:00
robust-futex-ABI.txt
robust-futexes.txt
rpmsg.txt	rpmsg: add virtio-based remote processor messaging bus	2012-02-08 22:53:58 +02:00
rt-mutex-design.txt
rt-mutex.txt
rtc.txt
SAK.txt
SecurityBugs
serial-console.txt
sgi-ioc4.txt
sgi-visws.txt
SM501.txt
sparse.txt
spinlocks.txt
stable_api_nonsense.txt
stable_kernel_rules.txt	stable: update documentation to ask for kernel version	2012-01-24 10:50:22 -08:00
static-keys.txt	static keys: Add docs better explaining the whole 'struct static_key' mechanism	2012-02-24 09:12:19 +01:00
SubmitChecklist	Documentation/SubmitChecklist: add RCU debug config options	2011-07-25 20:57:17 -07:00
SubmittingDrivers	Documentation: SubmittingDrivers: fix Linus's git tree URL	2011-08-13 18:34:03 -07:00
SubmittingPatches	Documentation: fix spelling error in SubmittingPatches	2011-08-13 18:34:02 -07:00
svga.txt
sysfs-rules.txt
sysrq.txt
unaligned-memory-access.txt
unicode.txt
unshare.txt
VGA-softcursor.txt
vgaarbiter.txt	misc latin1 to utf8 conversions	2012-01-02 13:04:55 +01:00
video-output.txt
volatile-considered-harmful.txt
workqueue.txt
xz.txt
zorro.txt