]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cedddd8 e716e01)
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 patch | diff1 | diff2 | blob | history
tools/perf/perf.h patch | diff1 | diff2 | blob | history

diff --cc include/linux/of.h
Simple merge
diff --cc tools/perf/perf.h
Simple merge
XArray, radix tree and IDR