summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rayctl.h
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2008-12-04 07:16:36 +0100
committerJames Morris <jmorris@namei.org>2008-12-04 07:16:36 +0100
commitec98ce480ada787f2cfbd696980ff3564415505b (patch)
tree1a4d644b38f9f1e4b4e086fde0b195df4a92cf84 /drivers/net/wireless/rayctl.h
parentMerge branch 'serge-next' into next (diff)
parentMerge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff)
downloadlinux-ec98ce480ada787f2cfbd696980ff3564415505b.tar.xz
linux-ec98ce480ada787f2cfbd696980ff3564415505b.zip
Merge branch 'master' into next
Conflicts: fs/nfsd/nfs4recover.c Manually fixed above to use new creds API functions, e.g. nfs4_save_creds(). Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'drivers/net/wireless/rayctl.h')
0 files changed, 0 insertions, 0 deletions