diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-09 12:23:41 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-09 12:23:41 -0700 |
commit | 93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95 (patch) | |
tree | ce7e4e6056b575138777793520dded9cb3638056 /arch/powerpc/sysdev/6xx-suspend.S | |
parent | ea81e2722e55ba0269c92f266763e445dcffb973 (diff) | |
parent | d6be118a97ce51ca84035270f91c2bccecbfac5f (diff) | |
download | blackbird-op-linux-93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95.tar.gz blackbird-op-linux-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 'arch/powerpc/sysdev/6xx-suspend.S')
0 files changed, 0 insertions, 0 deletions