diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-08 18:32:20 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-08 18:32:20 +0200 |
| commit | d6d4655172f9c5b9402bb453ed9145a7ab5c46d0 (patch) | |
| tree | 22f487b6711c42cae4222657e4f0b3f6caaf0944 /fs/nfsd/nfs4xdr.c | |
| parent | headers: mnt_namespace.h redux (diff) | |
| parent | powerpc: Don't use alloc_bootmem() in init_IRQ() path (diff) | |
| download | linux-d6d4655172f9c5b9402bb453ed9145a7ab5c46d0.tar.xz linux-d6d4655172f9c5b9402bb453ed9145a7ab5c46d0.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: Don't use alloc_bootmem() in init_IRQ() path
powerpc: Fix spin_event_timeout() to be robust over context switches
powerpc: Use pr_devel() in do_dcache_icache_coherency()
powerpc/cell: Use pr_devel() in axon_msi.c
powerpc: Use pr_devel() in arch/powerpc/mm/gup.c
powerpc: Cleanup & use pr_devel() in arch/powerpc/mm/slb.c
powerpc/perf_counter: Remove duplicated #include
powerpc: Use pr_devel() in arch/powerpc/mm/mmu_context_nohash.c
powerpc/pseries: Use pr_devel() in xics.c
powerpc: Remove unnecessary semicolons
powerpc/pseries: Use pr_devel() in pseries LPAR HPTE routines
powerpc/44x: Fix build error with -Werror for Warp platform
powerpc/4xx: Have Warp take advantage of GPIO LEDs default-state = keep
powerpc/44x: Update Warp defconfig
Diffstat (limited to 'fs/nfsd/nfs4xdr.c')
0 files changed, 0 insertions, 0 deletions