]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 620ddaa 3079910)
Merge branch 'kbuild/rc-fixes' into kbuild/for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 1 Dec 2010 15:13:03 +0000 (16:13 +0100)
committerMichal Marek <mmarek@suse.cz>
Wed, 1 Dec 2010 15:13:03 +0000 (16:13 +0100)
I took Mauro's branch for the menu visibility feature, so there are now
two histories for the same in the for-next branch. This is unfortunate,
but let's keep for-next pullable.

Signed-off-by: Michal Marek <mmarek@suse.cz>

Trivial merge
Linux kernel for KaRo TX COM modules