tree 0f830089234ecc2a66dbaca3eb7a4d30efd23583
parent 3a48d1c08fe0db79b8647b7042e6a077588b374a
parent 657b12d3a1508a3f06f7afe21d5dda7252279520
author Linus Torvalds <torvalds@linux-foundation.org> 1334070574 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1334070574 -0700

Merge branch 'for-3.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

Pull UML fixes from Richard Weinberger.

* 'for-3.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: uml_setup_stubs': warning: unused variable 'pages'
  um: Use asm-generic/switch_to.h
  um: Disintegrate asm/system.h
  um: switch cow_user.h to htobe{32,64}/betoh{32,64}
  um: several x86 hw-dependent crypto modules won't build on uml
  um: fix linker script generation