Merge tag 'driver-core-3.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Jan 2013 17:07:11 +0000 (09:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Jan 2013 17:07:11 +0000 (09:07 -0800)
commit3441f0d26d02ec8073ea9ac7d1a4da8a9818ad59
treefb82a5ae8ec99df63ed13ea72d9eaf1d8ed0c0b7
parentf6a0e2ca7b1fe89da4e4b0afa6ba08dc34f1a0f7
parentf1688e0431d3a395388e70fe21da89ed0de0c323
Merge tag 'driver-core-3.8-rc3' of git://git./linux/kernel/git/gregkh/driver-core

Pull driver core fixes from Greg Kroah-Hartman:
 "Here are two patches for 3.8-rc3.

  One removes the __dev* defines from init.h now that all usages of it
  are gone from your tree.  The other fix is for debugfs's paramater
  that was using the wrong base for the option.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
* tag 'driver-core-3.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  debugfs: convert gid= argument from decimal, not octal
  Remove __dev* markings from init.h