scsi.h: eliminate compile warning
msm-of: eliminate section mismatch warnings
Linux 3.4.1

Conflicts:

	drivers/usb/host/xhci.h

Conflicts:

	drivers/mmc/core/cd-gpio.c
Linux 3.4.2
Linux 3.4.3
Linux 3.4.4
Linux 3.4.5

Conflicts:

	drivers/usb/host/xhci-hub.c
Linux 3.4.6 - 3.4.10

Conflicts:

	mm/vmscan.c
	net/wireless/reg.c

Conflicts:

	drivers/mmc/host/sdhci.c
	drivers/staging/zsmalloc/zsmalloc-main.c
	drivers/usb/core/hub.c
usb: Revert "xhci: Switch PPT ports to EHCI on shutdown"
ext4: remove warning
Linux 3.4.11 - 3.4.20

Conflicts:

	include/sound/core.h
	mm/vmscan.c

Conflicts:

	drivers/interceptor/linux_versions.h
	kernel/events/core.c
Linux 3.4.21 - 3.4.30

Conflicts:

	mm/shmem.c
Linux 3.4.31 - 3.4.40

Conflicts:

	net/ipv4/ping.c
Linux 3.4.41 - 3.4.50

Conflicts:

	arch/arm/kernel/perf_event.c
	include/linux/kref.h
	kernel/sched/core.c
	net/wireless/reg.c

Conflicts:

	include/linux/kref.h
	kernel/sched/core.c
Fix Linux update merge errors
Linux 3.4.51 - 3.4.60

Conflicts:

	arch/arm/kernel/perf_event.c
	kernel/workqueue.c

Conflicts:

	crypto/algapi.c
Linux 3.4.61
Linux 3.4.62
Linux 3.4.63
Linux 3.4.64

Conflicts:

	drivers/hid/hid-logitech-dj.c