Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[pandora-kernel.git] / kernel / sys.c
diff --cc kernel/sys.c
Simple merge