Merge branch 'kbuild' into for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 5 Jan 2011 22:52:07 +0000 (22:52 +0000)
committerMichal Marek <mmarek@suse.cz>
Wed, 5 Jan 2011 22:52:07 +0000 (22:52 +0000)

Trivial merge