commit | f15f41383d466860f8b22f669da8c841f8d73c3b | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Wed Sep 19 11:38:25 2007 -0700 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Wed Sep 19 11:38:25 2007 -0700 |
tree | 527f4d443832deb11e592d6a7f33edd4b726b1ac | |
parent | dbe3ed1c078c193be34326728d494c5c4bc115e2 [diff] | |
parent | c27da339698145a9383e052c1070a950d30da478 [diff] |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Fix timekeeping on PowerPC 601 [POWERPC] Don't expose clock vDSO functions when CPU has no timebase [POWERPC] spusched: Fix null pointer dereference in find_victim