Merge branch 'kbuild' into for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 11 May 2011 11:42:11 +0000 (11:42 +0000)
committerMichal Marek <mmarek@suse.cz>
Wed, 11 May 2011 11:42:11 +0000 (11:42 +0000)

Trivial merge