Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Thu, 3 Apr 2008 21:33:42 +0000 (14:33 -0700)]
1  2 
Documentation/feature-removal-schedule.txt
MAINTAINERS
lib/kobject_uevent.c
net/core/sock.c
net/rxrpc/ar-internal.h

diff --cc MAINTAINERS
Simple merge
Simple merge
diff --cc net/core/sock.c
Simple merge
Simple merge