Linus Torvalds 833e68340d Merge git://www.linux-watchdog.org/linux-watchdog ... Pull watchdog updates from Wim Van Sebroeck: - lots of devm_ conversions and cleanup - platform_set_drvdata cleanups - s3c2410: dev_err/dev_info + dev_pm_ops - watchdog_core: don't try to stop device if not running fix - wdrtas: use print_hex_dump - xilinx cleanups - orion_wdt fixes - softdog cleanup - hpwdt: check on UEFI bits - deletion of mpcore_wdt driver - addition of broadcom BCM2835 watchdog timer driver - addition of MEN A21 watcdog devices * git://www.linux-watchdog.org/linux-watchdog: (38 commits) watchdog: hpwdt: Add check for UEFI bits watchdog: softdog: remove replaceable ping operation watchdog: New watchdog driver for MEN A21 watchdogs Watchdog: fix clearing of the watchdog interrupt Watchdog: allow orion_wdt to be built for Dove watchdog: Add Broadcom BCM2835 watchdog timer driver watchdog: delete mpcore_wdt driver watchdog: xilinx: Setup the origin compatible string watchdog: xilinx: Fix driver header watchdog: wdrtas: don't use custom version of print_hex_dump watchdog: core: don't try to stop device if not running watchdog: jz4740: Pass device to clk_get watchdog: twl4030: Remove redundant platform_set_drvdata() watchdog: mpcore: Remove redundant platform_set_drvdata() watchdog: da9055: use platform_{get,set}_drvdata() watchdog: da9052: use platform_{get,set}_drvdata() watchdog: cpwd: use platform_{get,set}_drvdata() watchdog: s3c2410_wdt: convert s3c2410wdt to dev_pm_ops watchdog: s3c2410_wdt: use dev_err()/dev_info() instead of pr_err()/pr_info() watchdog: wm831x: use platform_{get,set}_drvdata() ...		2013-07-13 13:42:54 -07:00
..
accessibility
acpi	More power management and ACPI updates for 3.11-rc1	2013-07-11 12:28:17 -07:00
amba
ata	Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata	2013-07-03 19:49:46 -07:00
atm
auxdisplay
base	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2013-07-13 12:09:57 -07:00
bcma
block	Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze	2013-07-10 10:16:07 -07:00
bluetooth
bus	ARM SoC device tree changes	2013-07-02 14:23:01 -07:00
cdrom	drivers/cdrom/cdrom.c: use kzalloc() for failing hardware	2013-07-03 16:07:25 -07:00
char	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2013-07-09 16:04:31 -07:00
clk	Power management and ACPI updates for 3.11-rc1	2013-07-03 14:35:40 -07:00
clocksource	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-07-06 14:09:38 -07:00
connector
cpufreq	More power management and ACPI updates for 3.11-rc1	2013-07-11 12:28:17 -07:00
cpuidle	Power management and ACPI updates for 3.11-rc1	2013-07-03 14:35:40 -07:00
crypto	crypto: talitos: use sg_pcopy_to_buffer()	2013-07-09 10:33:30 -07:00
dca
devfreq	Merge branch 'akpm' (updates from Andrew Morton)	2013-07-03 17:12:13 -07:00
dio
dma	drivers/dma/iop-adma.c: fix new warnings	2013-07-09 10:33:19 -07:00
edac	Add MCE signatures for family 0x15, models 30-3f.	2013-07-03 13:11:18 -07:00
eisa
extcon	drivers: avoid format string in dev_set_name	2013-07-03 16:07:41 -07:00
firewire
firmware	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2013-07-04 10:29:23 -07:00
fmc
gpio	Power management and ACPI updates for 3.11-rc1	2013-07-03 14:35:40 -07:00
gpu	drm: avoid warning in drm_load_edid_firmware()	2013-07-10 14:21:46 -07:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2013-07-04 15:35:08 -07:00
hsi	drivers: avoid format string in dev_set_name	2013-07-03 16:07:41 -07:00
hv
hwmon	hwmon: (lm63) Drop redundant safety on cache lifetime	2013-07-08 14:18:24 +02:00
hwspinlock
i2c	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2013-07-04 14:02:09 -07:00
ide	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide	2013-07-10 18:15:41 -07:00
idle
iio	For the 3.11 merge we only have one new MFD driver for the Kontron PLD.	2013-07-10 11:10:27 -07:00
infiniband	Main batch of InfiniBand/RDMA changes for 3.11 merge window:	2013-07-13 12:57:21 -07:00
input	For the 3.11 merge we only have one new MFD driver for the Kontron PLD.	2013-07-10 11:10:27 -07:00
iommu	IOMMU Updates for Linux 3.11	2013-07-10 14:46:40 -07:00
ipack
irqchip	Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-07-02 16:14:35 -07:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-07-09 18:24:39 -07:00
leds	leds: mc13783: Fix "uninitialized variable" warning	2013-07-02 08:44:02 -07:00
lguest	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-07-04 11:40:58 -07:00
macintosh
mailbox
md	Add a device-mapper target called dm-switch to provide a multipath	2013-07-11 13:05:40 -07:00
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2013-07-13 12:09:57 -07:00
memory
memstick	drivers/memstick/host/r592.c: convert to module_pci_driver	2013-07-03 16:08:06 -07:00
message	drivers: avoid format strings in names passed to alloc_workqueue()	2013-07-03 16:07:41 -07:00
mfd	For the 3.11 merge we only have one new MFD driver for the Kontron PLD.	2013-07-10 11:10:27 -07:00
misc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-07-04 11:40:58 -07:00
mmc	MMC highlights for 3.11:	2013-07-10 11:16:00 -07:00
mtd	A couple of fixes and clean-ups, allow for assigning user-defined	2013-07-05 12:09:48 -07:00
net	Main batch of InfiniBand/RDMA changes for 3.11 merge window:	2013-07-13 12:57:21 -07:00
nfc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-07-09 18:24:39 -07:00
ntb
nubus
of	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-07-09 18:24:39 -07:00
oprofile
parisc	parisc: fix LMMIO mismatch between PAT length and MASK register	2013-07-09 22:09:16 +02:00
parport	Merge branch 'akpm' (updates from Andrew Morton)	2013-07-03 17:12:13 -07:00
pci	Merge branch 'akpm' (updates from Andrew Morton)	2013-07-03 17:12:13 -07:00
pcmcia	Driver core patches for 3.11-rc1	2013-07-02 11:44:19 -07:00
pinctrl	Pin control changes for the v3.11 kernel cycle:	2013-07-03 11:48:03 -07:00
platform	drivers: avoid format string in dev_set_name	2013-07-03 16:07:41 -07:00
pnp	Power management and ACPI updates for 3.11-rc1	2013-07-03 14:35:40 -07:00
power	Nothing exciting this time, just assorted fixes and cleanups.	2013-07-10 11:13:00 -07:00
pps	pps-gpio: add device-tree binding and support	2013-07-03 16:08:06 -07:00
ps3
ptp
pwm
rapidio	rapidio: change endpoint device name format	2013-07-03 16:08:05 -07:00
regulator	For the 3.11 merge we only have one new MFD driver for the Kontron PLD.	2013-07-10 11:10:27 -07:00
remoteproc	Trivial remoteproc fixes by Suman Anna, Wei Yongjun and Thomas Meyer.	2013-07-11 12:35:09 -07:00
reset
rpmsg
rtc	For the 3.11 merge we only have one new MFD driver for the Kontron PLD.	2013-07-10 11:10:27 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-07-09 18:24:39 -07:00
sbus
scsi	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2013-07-11 12:57:19 -07:00
sfi
sh
sn
spi	Merge branch 'akpm' (updates from Andrew Morton)	2013-07-03 17:12:13 -07:00
ssb
staging	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2013-07-13 12:09:57 -07:00
target	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2013-07-11 12:57:19 -07:00
tc
thermal	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2013-07-11 12:26:08 -07:00
tty	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2013-07-04 15:35:08 -07:00
uio	uio: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT	2013-07-03 16:07:26 -07:00
usb	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2013-07-13 12:09:57 -07:00
uwb	drivers: avoid format string in dev_set_name	2013-07-03 16:07:41 -07:00
vfio	vfio Updates for v3.11	2013-07-10 14:50:08 -07:00
vhost	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2013-07-11 12:57:19 -07:00
video	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2013-07-09 16:04:31 -07:00
virt
virtio	No real surprises.	2013-07-10 14:50:58 -07:00
vlynq
vme
w1	drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode	2013-07-03 16:08:06 -07:00
watchdog	watchdog: hpwdt: Add check for UEFI bits	2013-07-11 22:20:06 +02:00
xen	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-07-06 14:09:38 -07:00
zorro
Kconfig	For the 3.11 merge we only have one new MFD driver for the Kontron PLD.	2013-07-10 11:10:27 -07:00
Makefile	For the 3.11 merge we only have one new MFD driver for the Kontron PLD.	2013-07-10 11:10:27 -07:00