diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 16:06:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 16:06:51 -0800 |
| commit | b6fedfd2a18a489d31246312f7279f82e3cc6b37 (patch) | |
| tree | eeaac614f3bb97731dfd9d9614f87f006b651117 /fs/udf/inode.c | |
| parent | c32da02342b7521df25fefc2ef20aee0e61cf887 (diff) | |
| parent | 30124d11097e371e42052144d8a3f4a78d26e09f (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/booke: Fix breakpoint/watchpoint one-shot behavior
powerpc: Reduce printk from pseries_mach_cpu_die()
powerpc: Move checks in pseries_mach_cpu_die()
powerpc: Reset kernel stack on cpu online from cede state
powerpc: Fix G5 thermal shutdown
powerpc/pseries: Pass CPPR value to H_XIRR hcall
powerpc/booke: Fix a couple typos in the advanced ptrace code
powerpc: Fix SMP build with disabled CPU hotplugging.
powerpc: Dynamically allocate pacas
powerpc/perf: e500 support
powerpc/perf: Build callchain code regardless of hardware event support.
powerpc/cpm2: Checkpatch cleanup
powerpc/86xx: Renaming following split of GE Fanuc joint venture
powerpc/86xx: Convert gef_pic_lock to raw_spinlock
powerpc/qe: Convert qe_ic_lock to raw_spinlock
powerpc/82xx: Convert pci_pic_lock to raw_spinlock
powerpc/85xx: Convert socrates_fpga_pic_lock to raw_spinlock
Diffstat (limited to 'fs/udf/inode.c')
0 files changed, 0 insertions, 0 deletions