diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-18 12:05:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-18 12:05:01 -0700 |
| commit | 04cde035fa47b4a7465a15db8d6eaebcc15a68af (patch) | |
| tree | ea70ab0cb99a8337f1822ec2f7e2ed5a7918bd8d /arch/cris | |
| parent | 1de481ded98d1d48e2a4102a5aa549e3c4d18ee3 (diff) | |
| parent | 50d0b17645a26d2877c9d5538114498c3f82adac (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc: Use generic compat_sys_old_readdir
powerpc/kexec: Fix up KEXEC_CONTROL_CODE_SIZE missed during conversion
powerpc: Remove dead module_find_bug code
powerpc: Add CMO enabled flag and paging space data to lparcfg
powerpc: Fix CMM page loaning on 64k page kernel with 4k hardware pages
powerpc: Make CMO paging space pool ID and page size available
powerpc: Fix lockdep IRQ tracing bug
powerpc: Fix TLB invalidation on boot on 32-bit
powerpc: Fix loss of vdso on fork on 32-bit
Diffstat (limited to 'arch/cris')
0 files changed, 0 insertions, 0 deletions