| commit | dd0e101d630b0d7ed6c9e1ccf7af7fc91818330e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 25 12:03:36 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 25 12:03:36 2008 -0700 |
| tree | 95418fcada0506baa001be22b1202ead681e08ca | |
| parent | cf2ec150fc5f59dbf2260863225c79aa0cfc46af [diff] | |
| parent | 00c6b2d5d7b2414bd46c620d6a8c37fa7a716f29 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-x86-fixes4 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-x86-fixes4: x86: harden kernel code patching x86: clean up text_poke() x86: fix text_poke() x86: remove set_fixmap() warning x86: make __set_fixmap() non-init x86: make clear_fixmap() available on 64-bit as well