Linus Torvalds 4fe19a136a Merge git://www.linux-watchdog.org/linux-watchdog ... Pull watchdog updates from Wim Van Sebroeck: "This includes some fixes and code improvements (like clk_prepare_enable and clk_disable_unprepare), conversion from the omap_wdt and twl4030_wdt drivers to the watchdog framework, addition of the SB8x0 chipset support and the DA9055 Watchdog driver and some OF support for the davinci_wdt driver." * git://www.linux-watchdog.org/linux-watchdog: (22 commits) watchdog: mei: avoid oops in watchdog unregister code path watchdog: Orion: Fix possible null-deference in orion_wdt_probe watchdog: sp5100_tco: Add SB8x0 chipset support watchdog: davinci_wdt: add OF support watchdog: da9052: Fix invalid free of devm_ allocated data watchdog: twl4030_wdt: Change TWL4030_MODULE_PM_RECEIVER to TWL_MODULE_PM_RECEIVER watchdog: remove depends on CONFIG_EXPERIMENTAL watchdog: Convert dev_printk(KERN_<LEVEL> to dev_<level>( watchdog: DA9055 Watchdog driver watchdog: omap_wdt: eliminate goto watchdog: omap_wdt: delete redundant platform_set_drvdata() calls watchdog: omap_wdt: convert to devm_ functions watchdog: omap_wdt: convert to new watchdog core watchdog: WatchDog Timer Driver Core: fix comment watchdog: s3c2410_wdt: use clk_prepare_enable and clk_disable_unprepare watchdog: imx2_wdt: Select the driver via ARCH_MXC watchdog: cpu5wdt.c: add missing del_timer call watchdog: hpwdt.c: Increase version string watchdog: Convert twl4030_wdt to watchdog core davinci_wdt: preparation for switch to common clock framework ...		2012-12-21 17:10:29 -08:00
..
ABI	Merge branch 'akpm' (Andrew's patch-bomb)	2012-12-20 20:00:43 -08:00
accounting	doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c	2012-11-26 14:22:21 +01:00
acpi	Merge branch 'x86-acpi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-12-14 10:03:23 -08:00
aoe	aoe: allow user to disable target failure timeout	2012-12-17 17:15:25 -08:00
arm	fbdev changes for 3.8:	2012-12-15 13:03:48 -08:00
arm64	Documentation: Fixes a word in Documentation/arm64/memory.txt	2012-11-29 16:33:18 +00:00
auxdisplay
backlight	drivers/video/backlight/lp855x_bl.c: use generic PWM functions	2012-12-17 17:15:16 -08:00
blackfin
block
blockdev
bus-devices	ARM: OMAP2+: gpmc: generic timing calculation	2012-11-09 18:07:11 +05:30
cdrom
cgroups	kmem: add slab-specific documentation about the kmem controller	2012-12-18 15:02:15 -08:00
connector
console
cpu-freq
cpuidle
cris
crypto	KEYS: Document asymmetric key type	2012-10-08 13:50:12 +10:30
development-process
device-mapper	DM RAID: Add rebuild capability for RAID10	2012-10-11 13:40:24 +11:00
devicetree	Merge git://www.linux-watchdog.org/linux-watchdog	2012-12-21 17:10:29 -08:00
DocBook	kstrto*: add documentation	2012-12-17 17:15:22 -08:00
driver-model
dvb
early-userspace
EDID
extcon
fault-injection	doc: fix quite a few typos within Documentation	2012-11-19 14:28:24 +01:00
fb
filesystems	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-12-20 18:14:31 -08:00
firmware_class	firmware loader: document firmware cache mechanism	2012-11-14 15:07:18 -08:00
frv
hid	doc: fix quite a few typos within Documentation	2012-11-19 14:28:24 +01:00
hwmon	hwmon: (it87) Report thermal sensor type as Intel PECI if appropriate	2012-12-19 22:17:02 +01:00
i2c	i2c: Mention functionality flags in SMBus protocol documentation	2012-12-16 21:11:55 +01:00
i2o
ia64
ide
infiniband
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2012-12-13 12:00:48 -08:00
ioctl
isdn
ja_JP
kbuild	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-12-13 12:00:02 -08:00
kdump
ko_KR
laptops
leds
m68k
make
memory-devices
mips
misc-devices	doc: fix quite a few typos within Documentation	2012-11-19 14:28:24 +01:00
mmc	mmc: core: Extend sysfs to ext_csd parameters for RPMB support	2012-12-06 13:54:48 -05:00
mn10300
mtd
namespaces
netlabel
networking	doc: Tighten-up and clarify description of tcp_fin_timeout	2012-12-10 17:14:28 -05:00
nfc
parisc
PCI	PCI: SRIOV control and status via sysfs (documentation)	2012-11-28 11:25:47 -07:00
pcmcia
power	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux	2012-12-11 22:15:57 -08:00
powerpc	powerpc/hw-breakpoint: Use generic hw-breakpoint interfaces for new PPC ptrace flags	2012-11-15 13:00:23 +11:00
pps
prctl	seccomp: Make syscall skipping and nr changes more consistent	2012-10-02 21:14:29 +10:00
pti
ptp
rapidio
RCU	Merge branches 'urgent.2012.10.27a', 'doc.2012.11.16a', 'fixes.2012.11.13a', 'srcu.2012.10.27a', 'stall.2012.11.13a', 'tracing.2012.11.08a' and 'idle.2012.10.24a' into HEAD	2012-11-16 09:59:58 -08:00
s390
scheduler
scsi	[SCSI] hptiop: Support HighPoint RR4520/RR4522 HBA	2012-11-27 08:59:43 +04:00
security	Documentation: fix Documentation/security/00-INDEX	2012-12-17 17:15:22 -08:00
serial
sh
sound	ALSA: usb-audio: Deprecate async_unlink option	2012-11-21 11:37:40 +01:00
spi	spi: Updates for v3.7	2012-10-02 17:26:42 -07:00
sysctl	coredump: add support for %d=__get_dumpable() in core name	2012-10-06 03:05:15 +09:00
target
thermal	Thermal: Add documentation for platform layer data	2012-11-05 14:00:09 +08:00
timers
trace
usb	USB: report submission of active URBs	2012-11-11 18:10:46 -08:00
vDSO
video4linux	doc: fix quite a few typos within Documentation	2012-11-19 14:28:24 +01:00
virtual	KVM: PPC: booke: Get/set guest EPCR register using ONE_REG interface	2012-12-06 01:34:20 +01:00
vm	Merge branch 'akpm' (Andrew's patch-bomb)	2012-12-13 13:11:15 -08:00
w1
watchdog
wimax
x86	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-12-19 12:56:42 -08:00
xtensa	xtensa: initialize atomctl SR	2012-12-18 21:10:22 -08:00
zh_CN	Documentation:Update Documentation/zh_CN/arm64/memory.txt	2012-11-26 16:25:37 -08:00
.gitignore
00-INDEX	Documentation: remove reference to feature-removal-schedule.txt	2012-12-17 17:15:12 -08:00
applying-patches.txt
atomic_ops.txt
bad_memory.txt
basic_profiling.txt
binfmt_misc.txt
braille-console.txt
bt8xxgpio.txt
btmrvl.txt
BUG-HUNTING
bus-virt-phys-mapping.txt
cachetlb.txt
Changes
circular-buffers.txt
clk.txt
coccinelle.txt
CodingStyle	CodingStyle: add networking specific block comment style	2012-10-06 03:04:59 +09:00
cpu-hotplug.txt	doc: Add x86 CPU0 online/offline feature	2012-11-14 09:39:44 -08:00
cpu-load.txt
cputopology.txt
crc32.txt
dcdbas.txt
debugging-modules.txt
debugging-via-ohci1394.txt
dell_rbu.txt
devices.txt	firmware: remove last vestiges of dabusb	2012-11-21 13:03:01 -08:00
digsig.txt
DMA-API-HOWTO.txt	Documentation DMA-API-HOWTO.txt Add dma mapping error check usage examples	2012-10-24 17:07:43 +02:00
DMA-API.txt	dma-debug: New interfaces to debug dma mapping errors	2012-10-24 17:06:43 +02:00
DMA-attributes.txt	common: DMA-mapping: add DMA_ATTR_FORCE_CONTIGUOUS attribute	2012-11-29 03:30:34 -08:00
dma-buf-sharing.txt	doc: fix quite a few typos within Documentation	2012-11-19 14:28:24 +01:00
DMA-ISA-LPC.txt
dmaengine.txt
dontdiff	x86: remove offsets.h from .gitignore and dontdiff	2012-11-19 14:10:53 +01:00
dynamic-debug-howto.txt
edac.txt
eisa.txt
email-clients.txt
flexible-arrays.txt
futex-requeue-pi.txt
gcov.txt
gpio.txt	gpiolib: provide provision to register pin ranges	2012-11-11 19:06:00 +01:00
highuid.txt
HOWTO	HOWTO: fix double words typo	2012-12-10 15:54:27 +01:00
hw_random.txt
hwspinlock.txt
init.txt
initrd.txt
intel_txt.txt
Intel-IOMMU.txt
io_ordering.txt
io-mapping.txt
iostats.txt
IPMI.txt	IPMI: Remove SMBus driver info from the docs	2012-10-16 18:07:12 -07:00
IRQ-affinity.txt
IRQ-domain.txt	irqdomain: update documentation	2012-12-05 23:52:10 +00:00
IRQ.txt
irqflags-tracing.txt
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt	Kernel-doc: Convention: Use a "Return" section to describe return values	2012-11-27 21:08:57 +01:00
kernel-docs.txt
kernel-parameters.txt	Documentation: kernel-parameters.txt remove capability.disable	2012-12-20 17:40:19 -08:00
kmemcheck.txt
kmemleak.txt
kobject.txt
kprobes.txt
kref.txt	kref: Add kref_get_unless_zero documentation	2012-11-28 18:36:06 +10:00
ldm.txt
local_ops.txt
lockdep-design.txt
lockstat.txt
lockup-watchdogs.txt
logo.gif
logo.txt
magic-number.txt
Makefile
ManagementStyle
md.txt
media-framework.txt
memory-barriers.txt	Documentation: Fix memory-barriers.txt example	2012-10-23 14:44:46 -07:00
memory-hotplug.txt	hotplug: update nodemasks management	2012-12-12 17:38:33 -08:00
mono.txt
mutex-design.txt
nommu-mmap.txt
numastat.txt
oops-tracing.txt
padata.txt
parport-lowlevel.txt
parport.txt
percpu-rw-semaphore.txt
pi-futex.txt
pinctrl.txt	gpiolib: provide provision to register pin ranges	2012-11-11 19:06:00 +01:00
pnp.txt
preempt-locking.txt
printk-formats.txt	lib/vsprintf: update documentation to cover all of %p[Mm][FR]	2012-10-06 03:04:50 +09:00
pwm.txt
ramoops.txt
rbtree.txt	rbtree: move augmented rbtree functionality to rbtree_augmented.h	2012-10-09 16:22:40 +09:00
remoteproc.txt
rfkill.txt
robust-futex-ABI.txt
robust-futexes.txt
rpmsg.txt
rt-mutex-design.txt
rt-mutex.txt
rtc.txt	rtc-proc: permit the /proc/driver/rtc device to use other devices	2012-10-06 03:05:01 +09:00
SAK.txt
SecurityBugs
serial-console.txt
sgi-ioc4.txt
sgi-visws.txt
SM501.txt
smsc_ece1099.txt
sparse.txt	Documentation/sparse.txt: document context annotations for lock checking	2012-12-17 17:15:23 -08:00
spinlocks.txt
stable_api_nonsense.txt
stable_kernel_rules.txt
static-keys.txt
SubmitChecklist
SubmittingDrivers
SubmittingPatches
svga.txt
sysfs-rules.txt
sysrq.txt	sparc64: Add global PMU register dumping via sysrq.	2012-10-16 09:34:01 -07:00
unaligned-memory-access.txt
unicode.txt
unshare.txt
vfio.txt
VGA-softcursor.txt
vgaarbiter.txt
video-output.txt
vme_api.txt
volatile-considered-harmful.txt
workqueue.txt
xz.txt
zorro.txt