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

Conflicts:
	kernel/Makefile

diff --cc kernel/Makefile
index 1cbdd721cb3843a517046dc0c350af3a6a9ed597,624d6d0b37c7ebbf5ec9aed61dee7a5bf50628d8..7fe1007bf4be6ed60b9cabec339be9a9e1a90145
--- 1/kernel/Makefile
--- 2/kernel/Makefile
+++ b/kernel/Makefile
@@@ -1,13 -1,10 +1,18 @@@
  obj-m += canethgw.o
  
 -all: debug
 -bench:
 -      make -C ../distro/kernel-bench M=`pwd`
 -debug:
 -      make -C ../distro/kernel-debug M=`pwd`
 +-include Makefile.local
 +# /usr/src/linux/_build_qemu
 +
 +KERNEL_DIR ?= /lib/modules/`uname -r`/build
 +
 +all:
 +      make -C $(KERNEL_DIR) M=`pwd`
 +install:
 +      make -C $(KERNEL_DIR) M=`pwd` modules_install
  clean:
 -      make -C ../distro/kernel-debug M=`pwd` clean
 +      make -C $(KERNEL_DIR) M=`pwd` clean
+ 
++bench:
++      $(MAKE) KERNEL_DIR=../distro/kernel-bench
++debug:
++      $(MAKE) KERNEL_DIR=../distro/kernel-debug