Linux 3.0.89

Conflicts:

	drivers/usb/serial/ti_usb_3410_5052.c

Conflicts:
	drivers/usb/serial/ti_usb_3410_5052.c

	modified:   Makefile
	modified:   arch/powerpc/include/asm/module.h
	modified:   arch/powerpc/kernel/vmlinux.lds.S
	modified:   drivers/acpi/acpi_memhotplug.c
	modified:   drivers/ata/Kconfig
	modified:   drivers/ata/sata_inic162x.c
	modified:   drivers/gpu/drm/radeon/atom.c
	modified:   drivers/gpu/drm/radeon/radeon_combios.c
	modified:   drivers/net/virtio_net.c
	modified:   drivers/scsi/qla2xxx/qla_iocb.c
	modified:   drivers/scsi/sd.c
	modified:   drivers/staging/comedi/comedi_fops.c
	modified:   drivers/usb/core/hub.c
	modified:   drivers/usb/host/xhci-ring.c
	modified:   drivers/usb/host/xhci.c
	modified:   drivers/usb/misc/sisusbvga/sisusb.c
	modified:   drivers/usb/serial/ftdi_sio.c
	modified:   drivers/usb/serial/ftdi_sio_ids.h
	modified:   drivers/usb/serial/ti_usb_3410_5052.c
	modified:   drivers/usb/storage/unusual_devs.h
	modified:   drivers/virtio/virtio_ring.c
	modified:   drivers/xen/evtchn.c
	modified:   fs/super.c
	modified:   include/linux/virtio.h
	modified:   kernel/trace/trace_syscalls.c
	modified:   mm/page_alloc.c
	modified:   sound/soc/codecs/max98088.c