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)
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...

1  2 
include/linux/of.h
tools/perf/perf.h

Simple merge
Simple merge