From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Nov 2011 04:36:26 +0000 (-0800)
Subject: Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: MMI-PSA29.97-13-9~17987
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0cda56962b883cd5e7aa036350e5a0283a88c590;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'driver-core-linus' of git://git./linux/kernel/git/gregkh/driver-core

* 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  drivers/base/node.c: fix compilation error with older versions of gcc
  uio: documentation fixups
  device.h: Fix struct member documentation
---

0cda56962b883cd5e7aa036350e5a0283a88c590