Linux 3.4.1

Conflicts:
	Makefile
	drivers/usb/core/hub.c

Conflicts:
	Makefile
	arch/arm/Makefile
	drivers/usb/core/hub.c

Conflicts:
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_tx_rx.h
	drivers/staging/prima/CORE/VOSS/inc/vos_getBin.h
	drivers/staging/prima/CORE/VOSS/inc/vos_types.h
Linux 3.4.2
Linux 3.4.3
Linux 3.4.4
Linux 3.4.5

Conflicts:
	arch/x86/kernel/cpu/scattered.c
Linux 3.4.6
Linux 3.4.7

Conflicts:
	mm/vmscan.c
Linux 3.4.8

Conflicts:
	drivers/staging/zsmalloc/zsmalloc-main.c
Linux 3.4.9

Conflicts:
	net/wireless/reg.c
Linux 3.4.10
Linux 3.4.11
Linux 3.4.12

Conflicts:
	kernel/kthread.c

Conflicts:
	block/test-iosched.c
	drivers/mmc/card/block.c
	kernel/kthread.c
	mm/vmscan.c
Linux 3.4.13
Linux 3.4.14
Linux 3.4.15

Conflicts:
	arch/arm/mm/cache-v7.S
Linux 3.4.16
Linux 3.4.17
Linux 3.4.18
Linux 3.4.19
Linux 3.4.20