Linux 3.4.11 - 3.4.20
Linux 3.4.21 - 3.4.30
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
Linux 3.4.61
Linux 3.4.62
Linux 3.4.63
Linux 3.4.64

Conflicts:

	drivers/hid/hid-logitech-dj.c
Linux 3.4.65
Linux 3.4.66
Linux 3.4.67
Fix merge errors
Linux 3.4.68
Linux 3.4.69
Linux 3.4.70
Linux 3.4.71