Deleted merge conflict codes in kernel/core/net/packet.c;
[ZeXOS.git] / kernel / 
tree70cdf325c79aab64007411bf5a03f1fda652a8ee
drwxr-xr-x   ..
-rw-r--r-- 100 AUTHORS
-rw-r--r-- 2234 Kconfig
-rw-r--r-- 32471 LICENSE
-rw-r--r-- 3674 Makefile
-rw-r--r-- 1000 README
drwxr-xr-x - arch
drwxr-xr-x - core
-rw-r--r-- 1653 defconfig
drwxr-xr-x - drivers
drwxr-xr-x - include
-rw-r--r-- 3182 kernel.mak
drwxr-xr-x - lib
drwxr-xr-x - utils