Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/net/wimax/i2400m/usb-notif.c

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-orion5x/common.c
Simple merge

diff --cc arch/m68knommu/platform/528x/config.c
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge

diff --cc lib/kobject_uevent.c
Simple merge

diff --cc net/Kconfig
Simple merge

diff --cc net/netfilter/nf_conntrack_pptp.c
Simple merge

diff --cc net/sunrpc/xprtsock.c
Simple merge