Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Nov 2011 04:36:26 +0000 (20:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Nov 2011 04:36:26 +0000 (20:36 -0800)
commit0cda56962b883cd5e7aa036350e5a0283a88c590
treeacb54a8550f3d768a45ad297761f8f6cba90d19e
parentb0d81664a0092d8f6df7742b5aee6fcfd326b36c
parent91a13c281d7d4648c0b32dede11a0144c4e7984c
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
include/linux/device.h