Merge branch 'kbuild' into for-next
authorMichal Marek <mmarek@suse.cz>
Mon, 2 May 2011 20:32:45 +0000 (20:32 +0000)
committerMichal Marek <mmarek@suse.cz>
Mon, 2 May 2011 20:32:45 +0000 (20:32 +0000)

Trivial merge