From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Jan 2009 02:14:05 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=5488ace40be22d3f23f58190ae48b2c8d4691f2b;p=openwrt%2Fstaging%2Fblogic.git

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
---

5488ace40be22d3f23f58190ae48b2c8d4691f2b