Merge branch 'kbuild' into for-next
authorMichal Marek <mmarek@suse.cz>
Thu, 28 Apr 2011 16:26:33 +0000 (16:26 +0000)
committerMichal Marek <mmarek@suse.cz>
Thu, 28 Apr 2011 16:26:33 +0000 (16:26 +0000)

Trivial merge