From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 1 Aug 2012 23:45:02 +0000 (-0700)
Subject: Merge branch 'for-linus-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.6-rc1~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1871e845e564c4e17f561ec4e5e4bb6bb8578685;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'for-linus-3.6-rc1' of git://git./linux/kernel/git/rw/uml

Pull UML fixes from Richard Weinberger:
 "This patch set contains mostly fixes and cleanups.  The UML tty driver
  uses now tty_port and is no longer broken like hell  :-)"

* 'for-linus-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: Add arch/x86/um to MAINTAINERS
  um: pass siginfo to guest process
  um: fix ubd_file_size for read-only files
  um: pull interrupt_end() into userspace()
  um: split syscall_trace(), pass pt_regs to it
  um: switch UPT_SET_RETURN_VALUE and regs_return_value to pt_regs
  um: set BLK_CGROUP=y in defconfig
  um: remove count_lock
  um: fully use tty_port
  um: Remove dead code
  um: remove line_ioctl()
  TTY: um/line, use tty from tty_port
  TTY: um/line, add tty_port
---

1871e845e564c4e17f561ec4e5e4bb6bb8578685