Merge remote-tracking branch 'origin/clustered' into aks_dev_clus
authorAkshay Giridhar <akshay87@vt.edu>
Tue, 24 Jun 2014 21:39:59 +0000 (17:39 -0400)
committerAkshay Giridhar <akshay87@vt.edu>
Tue, 24 Jun 2014 21:39:59 +0000 (17:39 -0400)
commit09b9211ac485d562d056bb03163755a43e0ece6b
tree9a5bd03fd0bc9fa81346634ba04c27f469264777
parentc2fbc29882af3ee4980372b8e21047e88f607f7f
parentb71f87586cc0a6c65e0d8e07cabef2cad3022817
Merge remote-tracking branch 'origin/clustered' into aks_dev_clus

Conflicts:
fs/exec.c
include/linux/popcorn.h
include/linux/process_server.h
kernel/futex.c
kernel/kinit.c
kernel/process_server.c
kernel/sched.c
pcnmsg/pcn_kmsg.c
fs/exec.c
include/linux/pcn_kmsg.h
include/linux/process_server.h
ipc/Makefile
kernel/kmod.c
kernel/process_server.c
pcnmsg/pcn_kmsg.c