From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 17 Dec 2008 23:00:54 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
X-Git-Tag: v2.6.28-rc9~9
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5b8bd54d5d38649a0a61e1146525212e81061971;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  STAGING: Move staging drivers back to staging-specific menu
  driver core: add newlines to debugging enabled/disabled messages
  xilinx_hwicap: remove improper wording in license statement
  driver core: fix using 'ret' variable in unregister_dynamic_debug_module
---

5b8bd54d5d38649a0a61e1146525212e81061971