Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Jan 2009 02:14:05 +0000 (18:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Jan 2009 02:14:05 +0000 (18:14 -0800)
commit5488ace40be22d3f23f58190ae48b2c8d4691f2b
tree657ebb2cba451fa9925ddaa3947d96378bdbe40a
parent05986e264ee638b6b6151aea89c9f191278c30f1
parent7cbcf22548df1f1df7c6b0d0bda579b92efca63c
Merge git://git./linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  driver-core: fix kernel-doc parameter name
  UIO: Add missing documentation of features added recently
  Sync patch for jp_JP/stable_kernel_rules.txt