diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-24 14:51:51 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-24 14:51:51 +1000 |
| commit | ef253765f0e892bc7cb3a6ecca48a192aee3e634 (patch) | |
| tree | 91dfd7bcce2a2c1c0c1f4afe749f6503e0ac7166 /net/sunrpc/auth_gss/svcauth_gss.c | |
| parent | cc2bb9d906f95eeb1e39a92e3ef6a7be826b3c2c (diff) | |
| parent | 2c088b61bc5ad021f3594ef7ed68907b3e67c1bd (diff) | |
Merge commit 'acpi/test'
Conflicts:
arch/x86/kernel/apm_32.c
Diffstat (limited to 'net/sunrpc/auth_gss/svcauth_gss.c')
0 files changed, 0 insertions, 0 deletions