]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit50aaeae1180b3437b8a89d01c179a00fbf3abd3b
tree5297c8c30c0423cf821c09188357862db7dcb8e4
parent620ddaacf50a0b413b430c56cc0beee3ed096c41
parent307991055b0ce65d53dc1eb501c456c10eb36360
Merge branch 'kbuild/rc-fixes' into kbuild/for-next

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>