Merge branch 'merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Sun, 25 Nov 2012 22:23:57 +0000 (09:23 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Sun, 25 Nov 2012 22:23:57 +0000 (09:23 +1100)
commit2a859ab07b6ab66f4134c4fffc341398bd3d328c
treec5e7eaf3bffbc18feb326940e39794328d98dc07
parentcedddd812a79a4fda3885a15711aee3de78c4a24
parente716e014384688d1a50d1aa5213ee74748c6d4e0
Merge branch 'merge' into next

Merge my own merge branch to get various fixes from there
and upstream, especially the hvc console tty refcouting fixes
which which testing is quite a bit harder...
include/linux/of.h
tools/perf/perf.h