Linus Torvalds 34ec4de42b Device tree fixes and reverts for v3.12-rc5 ... One bug fix and three reverts. The reverts back out the slightly controversial feeding the entire device tree into the random pool and the reserved-memory binding which isn't fully baked yet. Expect the reserved-memory patches at least to resurface for v3.13. The bug fixes removes a scary but harmless warning on SPARC that was introduced in the v3.12 merge window. v3.13 will contain a proper fix that makes the new code work on SPARC. On the plus side, the diffstat looks *awesome*. I love removing lines of code. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEcBAABAgAGBQJSXbO9AAoJEJZcAETA+ZUxuH4IAI/KF71fq0/O7en7GHo6ofcZ 3nA3fUyYpnjehaqmKDXxix4TUgKTYU1ZP6tn8VfM6fn0QthR2YXPYAqiIaRot3ab arCPvJ9N52CU04Ug8dqMPEuFlSqRfTYc0EVPTbdgv8GYWX+rjP4qmOWS13exorai hJSRFmbyvwOVvRAl7KtkBPEZ3ri40mfkTrMs61v55GajhaZFyoTQgMMNhboUskI7 qztWiecw1stlvbfQEoN+BA11ohp5kDf4d5jeTCMNFx81liBbZHYfwWbmwYPCH7/z 6s4gX6PQeCuygdhQK65q1tYebTmRbFxkuf8P/tO7lEpmR3fKIVBr+oMJff0q9ww= =8W6e -----END PGP SIGNATURE----- Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux Pull device tree fixes and reverts from Grant Likely: "One bug fix and three reverts. The reverts back out the slightly controversial feeding the entire device tree into the random pool and the reserved-memory binding which isn't fully baked yet. Expect the reserved-memory patches at least to resurface for v3.13. The bug fixes removes a scary but harmless warning on SPARC that was introduced in the v3.12 merge window. v3.13 will contain a proper fix that makes the new code work on SPARC. On the plus side, the diffstat looks *awesome*. I love removing lines of code" * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux: Revert "drivers: of: add initialization code for dma reserved memory" Revert "ARM: init: add support for reserved memory defined by device tree" Revert "of: Feed entire flattened device tree into the random pool" of: fix unnecessary warning on missing /cpus node		2013-10-15 17:14:13 -07:00
..
acpi	Merge branch 'acpi-hotplug'	2013-08-30 14:14:25 +02:00
asm-generic	mm: Fix generic hugetlb pte check return type.	2013-10-02 20:02:35 -04:00
clocksource	ARM: SoC cleanups for 3.12	2013-09-06 13:21:16 -07:00
crypto
drm	Revert "drm: mark context support as a legacy subsystem"	2013-09-20 08:32:59 +10:00
dt-bindings	ARM: dts: Fix pinctrl mask for omap3	2013-10-08 10:37:29 -07:00
keys
kvm	ARM: KVM: vgic: Bump VGIC_NR_IRQS to 256	2013-08-30 16:12:39 +03:00
linux	Device tree fixes and reverts for v3.12-rc5	2013-10-15 17:14:13 -07:00
math-emu
media	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-09-05 14:54:29 -07:00
memory
misc
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf	2013-10-01 12:39:35 -04:00
pcmcia
ras
rdma	Merge branches 'cxgb4', 'flowsteer', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next	2013-09-03 09:01:08 -07:00
rxrpc
scsi	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2013-09-12 16:11:45 -07:00
sound	sound fixes for 3.12-rc1	2013-09-12 08:52:41 -07:00
target	target/iscsi: Bump versions to v4.1.0	2013-09-10 20:23:37 -07:00
trace	Merge branch 'for-3.12/core' of git://git.kernel.dk/linux-block	2013-09-22 15:00:11 -07:00
uapi	Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux	2013-09-29 10:02:40 -07:00
video	fbdev changes for 3.12:	2013-09-05 09:49:32 -07:00
xen	Features:	2013-09-04 17:45:39 -07:00
Kbuild