diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 20:04:39 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 20:04:39 +0400 |
| commit | b472b8e22f9f9bc88dc73017d61609684289fb13 (patch) | |
| tree | cbb2ec0c2fd2cf6d9f4d2e323e97aa757bd93c59 /arch/m68k/include/uapi/asm/auxvec.h | |
| parent | d124a60dbbe7c12f3871e2c7fc71f98a821ee9a8 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
| download | linux-b472b8e22f9f9bc88dc73017d61609684289fb13.tar.xz | |
Merge 3.7-rc3 into usb-next.
This pulls in all of the USB changes in 3.7-rc3 into usb-next and
resolves the merge issue with:
drivers/usb/misc/ezusb.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/m68k/include/uapi/asm/auxvec.h')
| -rw-r--r-- | arch/m68k/include/uapi/asm/auxvec.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/m68k/include/uapi/asm/auxvec.h b/arch/m68k/include/uapi/asm/auxvec.h new file mode 100644 index 000000000000..844d6d52204b --- /dev/null +++ b/arch/m68k/include/uapi/asm/auxvec.h @@ -0,0 +1,4 @@ +#ifndef __ASMm68k_AUXVEC_H +#define __ASMm68k_AUXVEC_H + +#endif |