rtime.felk.cvut.cz Git - can-eth-gw.git/commit

author	Michal Sojka <sojkam1@fel.cvut.cz>
	Wed, 29 Aug 2012 07:24:20 +0000 (09:24 +0200)
committer	Michal Sojka <sojkam1@fel.cvut.cz>
	Wed, 29 Aug 2012 07:24:20 +0000 (09:24 +0200)
commit	779f3a62d8774dfb145946092e650ff556b6aa40
tree	63c50a4176afc1bee0e2fc416a726063332915c4	tree \| snapshot
parent	97989268ce6fade6843685c65594d05fbfc6549d	commit \| diff
parent	c7f9253b85bffd7254930cdcb6aa74c5b5be3198	commit \| diff

Merge branch 'master' of ssh://rtime.felk.cvut.cz/can-eth-gw

Conflicts:
kernel/Makefile