tree 64ae863b9fbae4cd16da8a2d8553573bd676e23c
parent b142ebb61cd36370c6fac5e0b8261a6cd7bba782
parent a75f5f0f0a3676216e0015b3040c785dbfe1e0da
author Linus Torvalds <torvalds@linux-foundation.org> 1274831596 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1274831596 -0700

Merge branch 'alpha-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6

* 'alpha-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
  alpha: simplify and optimize sched_find_first_bit
  alpha: invoke oom-killer from page fault
  Convert alpha to use clocksources instead of arch_gettimeoffset