David S. Miller 4ae127d1b6 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/smc911x.c		2008-06-13 20:52:39 -07:00
..
compat_mq.c
compat.c
ipc_sysctl.c
ipcns_notifier.c
Makefile
mqueue.c
msg.c
msgutil.c
namespace.c
sem.c
shm.c
util.c
util.h