From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Nov 2011 16:45:39 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://github.com/richardweinberger/linux
X-Git-Tag: firefly_0821_release~3680^2~4231
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=de0a5345a55b8dd5a4695181275df0e691176830;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://github.com/richardweinberger/linux

* 'for-linus' of git://github.com/richardweinberger/linux: (90 commits)
  um: fix ubd cow size
  um: Fix kmalloc argument order in um/vdso/vma.c
  um: switch to use of drivers/Kconfig
  UserModeLinux-HOWTO.txt: fix a typo
  UserModeLinux-HOWTO.txt: remove ^H characters
  um: we need sys/user.h only on i386
  um: merge delay_{32,64}.c
  um: distribute exports to where exported stuff is defined
  um: kill system-um.h
  um: generic ftrace.h will do...
  um: segment.h is x86-only and needed only there
  um: asm/pda.h is not needed anymore
  um: hw_irq.h can go generic as well
  um: switch to generic-y
  um: clean Kconfig up a bit
  um: a couple of missing dependencies...
  um: kill useless argument of free_chan() and free_one_chan()
  um: unify ptrace_user.h
  um: unify KSTK_...
  um: fix gcov build breakage
  ...
---

de0a5345a55b8dd5a4695181275df0e691176830