diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-08 08:05:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-08 08:05:43 -0700 |
| commit | 31016e9941be85e8c487b1f3c45d253eda356715 (patch) | |
| tree | f2984c3b651a72d8b160b7d7df545c01af6bef40 /crypto/pcrypt.c | |
| parent | 67415020950046e32f520c1447e79ebebbf447ac (diff) | |
| parent | bf23690b89b731468478c21eb07bbb645cc66ead (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Fix userspace build of ptrace.h
powerpc: Fix default_machine_crash_shutdown #ifdef botch
powerpc: Fix logic error in fixup_irqs
powerpc/iseries: Fix possible null pointer dereference in iSeries_pcibios_fixup_resources
powerpc: Linux cannot run with 0 cores
powerpc: Fix feature-fixup tests for gcc 4.5
powerpc: Disable SPARSE_IRQ by default
powerpc: Fix compile errors in prom_init_check for gcc 4.5
powerpc: Fix module building for gcc 4.5 and 64 bit
powerpc/perf_event: Fix for power_pmu_disable()
Diffstat (limited to 'crypto/pcrypt.c')
0 files changed, 0 insertions, 0 deletions