Merge branch 'alpha-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 May 2010 23:53:16 +0000 (16:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 May 2010 23:53:16 +0000 (16:53 -0700)
commitce7d0226198aac42ed311dd2783232adc16b296d
tree64ae863b9fbae4cd16da8a2d8553573bd676e23c
parentb142ebb61cd36370c6fac5e0b8261a6cd7bba782
parenta75f5f0f0a3676216e0015b3040c785dbfe1e0da
Merge branch 'alpha-next' of git://git./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