diff options
author | David Vrabel <david.vrabel@citrix.com> | 2014-04-07 16:52:12 +0400 |
---|---|---|
committer | David Vrabel <david.vrabel@citrix.com> | 2014-04-07 16:52:12 +0400 |
commit | 2c5cb2770392fb9c5d8518688c8bc61986d70dc6 (patch) | |
tree | b19210e709de6ee0d22b67ef605a569500cf1a18 /tools/include/linux/hash.h | |
parent | cd979883b9ede90643e019f33cb317933eb867b4 (diff) | |
parent | 683b6c6f82a60fabf47012581c2cfbf1b037ab95 (diff) | |
download | linux-2c5cb2770392fb9c5d8518688c8bc61986d70dc6.tar.xz |
Merge commit '683b6c6f82a60fabf47012581c2cfbf1b037ab95' into stable/for-linus-3.15
This merge of the irq-core-for-linus branch broke the ARM build when
Xen is enabled.
Conflicts:
drivers/xen/events/events_base.c
Diffstat (limited to 'tools/include/linux/hash.h')
-rw-r--r-- | tools/include/linux/hash.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/include/linux/hash.h b/tools/include/linux/hash.h new file mode 100644 index 000000000000..d026c6573018 --- /dev/null +++ b/tools/include/linux/hash.h @@ -0,0 +1,5 @@ +#include "../../../include/linux/hash.h" + +#ifndef _TOOLS_LINUX_HASH_H +#define _TOOLS_LINUX_HASH_H +#endif |