Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc lib/kobject_uevent.c
Simple merge

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

diff --cc net/rxrpc/ar-internal.h
Simple merge