Commit e8f4abf8 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'uaccess.csum' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull ia64 build regression fix from Al Viro:
 "Fix a braino in ia64 uaccess csum changes"

* 'uaccess.csum' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix a braino in ia64 uaccess csum changes
parents e7c93cbf 174e1ea8
......@@ -12,7 +12,7 @@
#include <linux/types.h>
#include <linux/string.h>
#include <linux/uaccess.h>
#include <net/checksum.h>
/*
* XXX Fixme: those 2 inlines are meant for debugging and will go away
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment