Merge branches 'debug-module-param' and 'upstream' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Mon, 9 Jul 2007 12:23:37 +0000 (14:23 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 9 Jul 2007 12:23:37 +0000 (14:23 +0200)

Trivial merge