diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-31 10:53:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-31 10:53:17 -0400 |
commit | 1fe01cb57c6272577ebb107a03253484f6dabe7c (patch) | |
tree | 11cd44b8bd5704589d477fbf2bb27d8f3fc17122 /fs/nfsd/nfs4recover.c | |
parent | 63b40456a30912084c90753582137b9e0495c5c3 (diff) | |
parent | 216813a8bb4db97eb7a6e75c533894430053df48 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (21 commits)
sh: fix sh2a cache entry_mask
sh: Enable NFS root in Migo-R defconfig.
sh: FTRACE renamed to FUNCTION_TRACER.
sh: Fix up the shared IRQ demuxer's control bit testing logic.
Define SCSPTR1 for SH 7751R
sh: Add sci_rxd_in of SH4-202
Add support usb setting on sh 7366
sh: Change register name SCSPTR to SCSPTR2
sh: use the new byteorder headers.
sh: SHmedia ISA tuning fixups.
sh: Kill off long-dead HD64465 cchip support.
sh: Revert "SH 7366 needs SCIF_ONLY"
sh: Simplify and lock down the ISA tuning.
sh: sh7785lcr: Select uImage as default image target.
sh: Add on-chip RTC support for SH7722.
SH 7366 needs SCIF_ONLY
gdrom: Fix compile error
sh: Provide a sample defconfig for the UL2 (SH7366) board.
sh: Fix FPU tuning on toolchains with mismatched multilib targets.
sh: oprofile: Fix up the SH7750 performance counter name.
...
Diffstat (limited to 'fs/nfsd/nfs4recover.c')
0 files changed, 0 insertions, 0 deletions