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

ipc: only output msgmni value at boot time

2008-06-06 11:29:12 -07:00

msgutil.c

…

namespace.c

…

sem.c

…

shm.c

/proc/sysvipc/shm: fix 32-bit truncation of segment sizes

2008-06-12 18:05:41 -07:00

util.c

…

util.h

…