Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 27 Apr 2006 21:25:30 +0000 (14:25 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 27 Apr 2006 21:25:30 +0000 (14:25 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  [PATCH] Added URI of "linux kernel development process"
  [PATCH] Kobject: possible cleanups
  [PATCH] Fix OCFS2 warning when DEBUG_FS is not enabled
  [PATCH] Kobject: fix build error
  [PATCH] Frame buffer: remove cmap sysfs interface


Trivial merge