]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8f9850e aaf5558)
Merge branch 'linus' into timers/core
authorIngo Molnar <mingo@elte.hu>
Mon, 15 Mar 2010 07:17:33 +0000 (08:17 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 15 Mar 2010 07:17:33 +0000 (08:17 +0100)
commite26b453697af7a151dd9a89072ff614dc746bbb1
tree73f78d62591b197cd53747e36a2f3d707b79a50btree | snapshot
parent8f9850ecd13fef2b0aaf93452a9e785594f47c9bcommit | diff
parentaaf55587e13b383ac3f59cc5ea15f345e76d3d55commit | diff
Merge branch 'linus' into timers/core

Conflicts:
Documentation/feature-removal-schedule.txt

Merge reason: Resolve the conflict, update to upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Documentation/feature-removal-schedule.txt diff1 | diff2 | blob | history
Linux Kernel Source Tree.