Merge branch 'kbuild/kbuild' into kbuild/for-next
authorMichal Marek <mmarek@suse.cz>
Fri, 18 Jun 2010 12:33:37 +0000 (14:33 +0200)
committerMichal Marek <mmarek@suse.cz>
Fri, 18 Jun 2010 12:33:37 +0000 (14:33 +0200)
Conflicts:
Makefile


Trivial merge