]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e6601e 228fdc0)
Merge branch 'linus' into timers/core
authorIngo Molnar <mingo@kernel.org>
Sun, 12 Jan 2014 13:12:44 +0000 (14:12 +0100)
committerIngo Molnar <mingo@kernel.org>
Sun, 12 Jan 2014 13:12:44 +0000 (14:12 +0100)
Pick up the latest fixes and refresh the branch.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
init/Kconfig patch | diff1 | diff2 | blob | history
kernel/time/tick-sched.c patch | diff1 | diff2 | blob | history

diff --cc init/Kconfig
Simple merge
diff --cc kernel/time/tick-sched.c
Simple merge
XArray, radix tree and IDR