summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-25 16:53:16 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-25 16:53:16 -0700
commitce7d0226198aac42ed311dd2783232adc16b296d (patch)
tree64ae863b9fbae4cd16da8a2d8553573bd676e23c /include/net
parentb142ebb61cd36370c6fac5e0b8261a6cd7bba782 (diff)
parenta75f5f0f0a3676216e0015b3040c785dbfe1e0da (diff)
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
Diffstat (limited to 'include/net')
0 files changed, 0 insertions, 0 deletions