tree cbe898dccc3cdd13bec413e2ce78ca043cccb106
parent 331c31351044888916805c9cb32d8bb9e40c12e9
parent 4b4cdf3979c32fa3d042d150f49449c74d048553
author Linus Torvalds <torvalds@linux-foundation.org> 1229554854 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1229554854 -0800

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