diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-15 07:41:27 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-15 07:41:27 +0200 |
| commit | c362495586e8a3a6487a318fcd82eaf15ffe2142 (patch) | |
| tree | 86f7b195d36ba198f24f86be327f21a8d24ec248 /arch/um/drivers/ubd_kern.c | |
| parent | tty: serial: sccnxp: Fix bug with unterminated platform_id list (diff) | |
| parent | Linux 3.7-rc1 (diff) | |
| download | linux-c362495586e8a3a6487a318fcd82eaf15ffe2142.tar.xz linux-c362495586e8a3a6487a318fcd82eaf15ffe2142.zip | |
Merge 3.7-rc1 into tty-linus
This syncs up the tty-linus branch to the latest in Linus's tree to get all of
the UAPI stuff needed for the next set of patches to merge.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/um/drivers/ubd_kern.c')
| -rw-r--r-- | arch/um/drivers/ubd_kern.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index 0643e5bc9f41..41bf72073ccc 100644 --- a/arch/um/drivers/ubd_kern.c +++ b/arch/um/drivers/ubd_kern.c @@ -33,12 +33,12 @@ #include <linux/platform_device.h> #include <linux/scatterlist.h> #include <asm/tlbflush.h> -#include "kern_util.h" +#include <kern_util.h> #include "mconsole_kern.h" -#include "init.h" -#include "irq_kern.h" +#include <init.h> +#include <irq_kern.h> #include "ubd.h" -#include "os.h" +#include <os.h> #include "cow.h" enum ubd_req { UBD_READ, UBD_WRITE }; |