summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-08 17:05:43 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-08 17:05:43 +0200
commit31016e9941be85e8c487b1f3c45d253eda356715 (patch)
treef2984c3b651a72d8b160b7d7df545c01af6bef40 /fs
parentMerge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentpowerpc: Fix userspace build of ptrace.h (diff)
downloadlinux-31016e9941be85e8c487b1f3c45d253eda356715.tar.xz
linux-31016e9941be85e8c487b1f3c45d253eda356715.zip
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 'fs')
0 files changed, 0 insertions, 0 deletions