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

Trivial merge