]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'kbuild/kbuild' into kbuild/for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 16 Apr 2014 21:32:03 +0000 (23:32 +0200)
committerMichal Marek <mmarek@suse.cz>
Wed, 16 Apr 2014 21:32:03 +0000 (23:32 +0200)
commitde71647f7af0cd00b50265498a21b4376955797d
tree25cce7eaa39e8db6a2ce45951095cfc8f6604eaa
parentd2f3390e735fee90e7ebf520b1d80dbd33588ad2
parenta86fe3537350613c0181ce936884036a9695ceea
Merge branch 'kbuild/kbuild' into kbuild/for-next

Conflicts:
Makefile
Makefile