diff options
| author | Linus Torvalds <[email protected]> | 2008-09-09 19:23:41 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2008-09-09 19:23:41 +0000 |
| commit | 93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95 (patch) | |
| tree | ce7e4e6056b575138777793520dded9cb3638056 /fs/proc/array.c | |
| parent | Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 (diff) | |
| parent | x86: fix memmap=exactmap boot argument (diff) | |
| download | kernel-93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95.tar.gz kernel-93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95.zip | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: fix memmap=exactmap boot argument
x86: disable static NOPLs on 32 bits
xen: fix 2.6.27-rc5 xen balloon driver warnings
Diffstat (limited to 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions