]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d526e85 667b504)
Merge remote-tracking branch 'agust/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 17 Dec 2012 23:22:27 +0000 (10:22 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 17 Dec 2012 23:22:27 +0000 (10:22 +1100)
Brings some 52xx updates. Also manually merged tools/perf/perf.h.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
1  2 
tools/perf/perf.h patch | diff1 | diff2 | blob | history

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