Merge branch 'kbuild' into for-next
authorMichal Marek <mmarek@suse.cz>
Thu, 12 May 2011 14:59:38 +0000 (14:59 +0000)
committerMichal Marek <mmarek@suse.cz>
Thu, 12 May 2011 14:59:38 +0000 (14:59 +0000)

Trivial merge