Linus Torvalds 6c09931b3f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux ... Pull s390 updates from Martin Schwidefsky: "The main new feature is machine support for System zEC12 including transactional memory, runtime instrumentation, support for scm block devices via eadm subchannels, and support for CEX4 crypto cards. In addition there are some nice improvements: bpf jit compiler, arch backend for cmpxchg_double, relative exception table entries, dasd partition detection independent from the dasd driver ioctls, and cpu cache information in /proc/cpuinfo and /sys/device/cpu. And last but not least a series of cleanup patches from Heiko." Fix up trivial add-add conflict in arch/s390/Kconfig due to commit b952741c80 ("cputime: Generalize CONFIG_VIRT_CPU_ACCOUNTING") * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (76 commits) s390: update defconfig s390/jump label,nss: let shared kernel support depend on !JUMP_LABEL s390/disassembler: fix decoding of risblg instruction s390/bpf,jit: add support for BPF_S_ANC_ALU_XOR_X instruction s390/traps: move call to print_modules() out of show_regs() s390/mm: mark free_initrd_mem() as __init s390/dasd: check count address during online setting drivers/s390/char/monreader.c: fix error return code s390/cmpxchg,percpu: implement cmpxchg_double() s390/percpu: implement this_cpu_add_return() s390/percpu: implement this_cpu_xchg() s390/kexec: remove CONFIG_KEXEC s390/irq: use designated initializers for irq class array s390: add uninitialized_var() to suppress false positive compiler warnings s390/crashdump: move fill_cpu_elf_notes() prototype to header file s390/process: add missing header include s390/ptrace: add missing ifdef s390/ipl,decrompressor: disable branch profiling s390/perf_events: compile only for CONFIG_64BIT s390/tape: remove even more tape block leftovers ...		2012-10-01 11:49:56 -07:00
..
accessibility	…
acpi	efi: Fix the ACPI BGRT driver for images located in EFI boot services memory	2012-09-29 12:21:03 -07:00
amba	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2012-07-27 15:14:26 -07:00
ata	ahci: Add identifiers for ASM106x devices	2012-09-13 00:24:29 -04:00
atm	drivers/atm/iphase.c: fix error return code	2012-08-06 13:29:57 -07:00
auxdisplay	…
base	Merge remote-tracking branches 'regmap/topic/cache' and 'regmap/topic/irq' into regmap-next	2012-09-22 12:02:05 -04:00
bcma	bcma: BCM43228 support	2012-08-02 13:51:46 -04:00
block	Merge git://git.infradead.org/users/willy/linux-nvme	2012-09-29 10:31:52 -07:00
bluetooth	Bluetooth: Add support for Apple vendor-specific devices	2012-08-27 08:36:42 -05:00
cdrom	…
char	drm/i915: fix hsw uncached pte	2012-08-17 09:21:35 +02:00
clk	ARM: 7537/1: clk: Fix release in devm_clk_put()	2012-09-19 21:51:27 +01:00
clocksource	cs5535-clockevt: typo, it's MFGPT, not MFPGT	2012-08-21 16:45:02 -07:00
connector	…
cpufreq	Merge branch 'for-3.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2012-09-19 11:00:07 -07:00
cpuidle	cpuidle: Prevent null pointer dereference in cpuidle_coupled_cpu_notify	2012-08-17 19:37:08 +02:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2012-09-12 07:14:17 +08:00
dca	…
devfreq	…
dio	…
dma	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-10-01 09:06:36 -07:00
edac	sb_edac: Avoid overflow errors at memory size calculation	2012-09-25 07:38:20 -03:00
eisa	…
extcon	Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass', 'regulator/topic/tol', 'regulator/topic/drivers' and 'regulator/topic/tps6586x' into regulator-next	2012-09-28 14:45:07 +01:00
firewire	- Small fixes and optimizations.	2012-07-30 09:32:39 -07:00
firmware	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
gpio	gpio-lpc32xx: Fix value handling of gpio_direction_output()	2012-09-24 21:56:01 +02:00
gpu	Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes	2012-09-27 17:58:53 +10:00
hid	Merge branch 'multitouch' into for-linus	2012-10-01 14:38:54 +02:00
hsi	…
hv	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
hwmon	hwmon: (fam15h_power) Tweak runavg_range on resume	2012-09-23 20:54:09 +02:00
hwspinlock	hwspinlock/core: move the dereference below the NULL test	2012-09-10 13:19:25 +03:00
i2c	Merge branch 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux	2012-09-14 17:55:57 -07:00
ide	ide: fix generic_ide_suspend/resume Oops	2012-08-21 14:54:42 -07:00
idle	intel_idle: Check cpu_idle_get_driver() for NULL before dereferencing it.	2012-08-17 19:37:14 +02:00
ieee802154	…
iio	drivers/iio/adc/at91_adc.c: adjust inconsistent IS_ERR and PTR_ERR	2012-08-27 21:15:25 +01:00
infiniband	Merge remote-tracking branch 'tip/core/rcu' into next.2012.09.25b	2012-09-25 10:03:56 -07:00
input	Merge branches 'from-henrik', 'hidraw', 'logitech', 'picolcd', 'ps3', 'uclogic', 'wacom' and 'wiimote' into for-linus	2012-10-01 14:36:26 +02:00
iommu	iommu/amd: Fix wrong assumption in iommu-group specific code	2012-09-28 16:14:44 +02:00
isdn	mISDN: Fix wrong usage of flush_work_sync while holding locks	2012-09-13 14:58:54 -04:00
leds	leds: renesas: fix error handling	2012-08-13 14:34:02 +08:00
lguest	lguest, x86: handle guest TS bit for lazy/non-lazy fpu host models	2012-09-18 15:52:09 -07:00
macintosh	…
md	A few fixes for problems discovered during the 3.6 cycle.	2012-09-28 10:00:01 -07:00
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-08-21 16:54:38 -07:00
memory	…
memstick	…
message	drivers/message/i2o/i2o_config.c: bound allocation	2012-07-30 17:25:17 -07:00
mfd	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-10-01 09:06:36 -07:00
misc	drivers/misc/sgi-xp/xpc_uv.c: SGI XPC fails to load when cpu 0 is out of IRQ resources	2012-08-21 16:45:03 -07:00
mmc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-10-01 09:06:36 -07:00
mtd	mtdchar: fix offset overflow detection	2012-09-28 12:13:46 -07:00
net	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-10-01 09:06:36 -07:00
nfc	…
nubus	…
of	dt: introduce for_each_available_child_of_node, of_get_next_available_child	2012-08-20 02:16:00 -07:00
oprofile	oprofile: Remove 'WQ on CPUx, prefer CPUy' warning	2012-08-27 14:49:39 +02:00
parisc	PCI changes for the 3.6 merge window:	2012-07-24 16:17:07 -07:00
parport	…
pci	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-10-01 09:06:36 -07:00
pcmcia	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2012-07-27 15:14:26 -07:00
pinctrl	pinctrl/nomadik: add kp_b_2 keyboard function group list	2012-08-17 11:09:58 +02:00
platform	thinkpad_acpi: buffer overflow in fan_get_status()	2012-09-13 16:46:31 -04:00
pnp	…
power	Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc	2012-08-02 11:52:39 -07:00
pps	pps: return PTR_ERR on error in device_create	2012-07-30 17:25:21 -07:00
ps3	…
ptp	…
pwm	pwm: pwm-tiehrpwm: Fix conflicting channel period setting	2012-09-10 17:04:38 +02:00
rapidio	rapidio/tsi721: fix unused variable compiler warning	2012-08-21 16:45:03 -07:00
regulator	Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass', 'regulator/topic/tol', 'regulator/topic/drivers' and 'regulator/topic/tps6586x' into regulator-next	2012-09-28 14:45:07 +01:00
remoteproc	A batch of remoteproc patches for 3.6:	2012-07-26 16:19:08 -07:00
rpmsg	rpmsg: fix dma_free_coherent dev parameter	2012-09-12 12:03:57 +03:00
rtc	drivers/rtc/rtc-twl.c: ensure all interrupts are disabled during probe	2012-09-17 15:00:38 -07:00
s390	s390/dasd: check count address during online setting	2012-09-26 15:45:26 +02:00
sbus	…
scsi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-10-01 09:06:36 -07:00
sfi	…
sh	sh: pfc: Fix up GPIO mux type reconfig case.	2012-09-25 11:51:05 +09:00
sn	…
spi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-10-01 09:06:36 -07:00
ssb	…
staging	This is the remaining MFD fixes for 3.6, with 5 pending fixes:	2012-09-16 13:22:21 -07:00
target	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-10-01 09:06:36 -07:00
tc	…
thermal	The tag contains just a few battery-related changes for v3.6. It's is	2012-07-31 18:08:25 -07:00
tty	tty: serial: imx: don't reinit clock in imx_setup_ufcr()	2012-09-05 12:44:44 -07:00
uio	…
usb	USB: Fix race condition when removing host controllers	2012-09-27 09:17:49 -07:00
uwb	…
vfio	vfio: Fix virqfd release race	2012-09-21 10:48:28 -06:00
vhost	tcm_vhost: Fix vhost_scsi_target structure alignment	2012-08-20 14:52:11 -07:00
video	Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-10-01 11:08:12 -07:00
virt	…
virtio	…
vlynq	…
vme	…
w1	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-10-01 09:06:36 -07:00
watchdog	watchdog: move the dereference below the NULL test	2012-09-10 17:33:17 +02:00
xen	xen/m2p: do not reuse kmap_op->dev_bus_addr	2012-09-12 11:21:40 -04:00
zorro	…
Kconfig	vfio: VFIO core	2012-07-31 08:16:22 -06:00
Makefile	vfio: VFIO core	2012-07-31 08:16:22 -06:00