Deleted merge conflict codes in kernel/core/net/packet.c;
tree43561ffe253b8098fdb8f14c442035cd5da01633
-rw-r--r-- 1986 INSTALL
-rw-r--r-- 3552 README
drwxr-xr-x - apps
-rwxr-xr-x 2826 build.sh
drwxr-xr-x - docs
drwxr-xr-x - iso
drwxr-xr-x - kernel
drwxr-xr-x - libc
drwxr-xr-x - libipc
drwxr-xr-x - libm
drwxr-xr-x - libpthread
drwxr-xr-x - libsnd
drwxr-xr-x - libx
drwxr-xr-x - modules
drwxr-xr-x - tools