projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b142ebb a75f5f0)
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)
* '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


Trivial merge
John Crispins staging tree