summaryrefslogtreecommitdiffstats
path: root/Documentation/kobject.txt
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-04-21 23:28:35 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-04-21 23:28:35 -0700
commit57b8628bb0ac4e47c806e45c5bbd89282e93869b (patch)
treeee9289f0898054474b7e5054abdb3ffb78666436 /Documentation/kobject.txt
parent486c8aba39e5f194519cd5c0e85e5d1de8b74b03 (diff)
parent66f75a5d028beaf67c931435fdc3e7823125730c (diff)
downloadblackbird-op-linux-57b8628bb0ac4e47c806e45c5bbd89282e93869b.tar.gz
blackbird-op-linux-57b8628bb0ac4e47c806e45c5bbd89282e93869b.zip
Merge commit 'v3.4-rc4' into next
Diffstat (limited to 'Documentation/kobject.txt')
-rw-r--r--Documentation/kobject.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kobject.txt b/Documentation/kobject.txt
index 3ab2472509cb..49578cf1aea5 100644
--- a/Documentation/kobject.txt
+++ b/Documentation/kobject.txt
@@ -1,6 +1,6 @@
Everything you never wanted to know about kobjects, ksets, and ktypes
-Greg Kroah-Hartman <gregkh@suse.de>
+Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Based on an original article by Jon Corbet for lwn.net written October 1,
2003 and located at http://lwn.net/Articles/51437/
OpenPOWER on IntegriCloud