]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70a3075 f61f1b5)
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Oct 2008 22:08:45 +0000 (15:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Oct 2008 22:08:45 +0000 (15:08 -0700)
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: fix compat-vdso
  x86/mm: unify init task OOM handling
  x86/mm: do not trigger a kernel warning if user-space disables interrupts and generates a page fault

1  2 
arch/x86/mm/fault.c patch | diff1 | diff2 | blob | history
include/asm-x86/pgtable.h patch | diff1 | diff2 | blob | history

diff --cc arch/x86/mm/fault.c
Simple merge
diff --cc include/asm-x86/pgtable.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.