Auto-update from upstream

arch/powerpc/platforms/pseries/xics.c

drivers/media/video/saa7127.c

drivers/media/video/saa7134/Kconfig

drivers/media/video/saa7134/Makefile

drivers/media/video/saa7134/saa7134-alsa.c

drivers/media/video/saa7134/saa7134-oss.c

drivers/scsi/scsi_scan.c

drivers/scsi/scsi_transport_fc.c

drivers/usb/core/usb.c

drivers/usb/storage/scsiglue.c

fs/nfs/file.c

include/linux/ipv6_route.h

include/linux/irq.h

include/linux/preempt.h

include/net/if_inet6.h

include/scsi/scsi_transport_fc.h

net/8021q/vlan.c

net/dccp/ipv4.c

net/ipv6/addrconf.c

net/ipv6/icmp.c