Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
tty: fix vt_compat_ioctl

+1 -1
+1 -1
drivers/char/vt_ioctl.c
··· 1532 1532 1533 1533 case PIO_UNIMAP: 1534 1534 case GIO_UNIMAP: 1535 - ret = do_unimap_ioctl(cmd, up, perm, vc); 1535 + ret = compat_unimap_ioctl(cmd, up, perm, vc); 1536 1536 break; 1537 1537 1538 1538 /*