Merge remote-tracking branch 'kernelorg/linux-3.0.y' into 3_0_64

Conflicts:
	arch/arm/Kconfig
	arch/arm/include/asm/hwcap.h
	arch/arm/kernel/smp.c
	arch/arm/plat-samsung/adc.c
	drivers/gpu/drm/i915/i915_reg.h
	drivers/gpu/drm/i915/intel_drv.h
	drivers/mmc/core/sd.c
	drivers/net/tun.c
	drivers/net/usb/usbnet.c
	drivers/regulator/max8997.c
	drivers/usb/core/hub.c
	drivers/usb/host/xhci.h
	drivers/usb/serial/qcserial.c
	fs/jbd2/transaction.c
	include/linux/migrate.h
	kernel/sys.c
	kernel/time/timekeeping.c
	lib/genalloc.c
	mm/memory-failure.c
	mm/memory_hotplug.c
	mm/mempolicy.c
	mm/page_alloc.c
	mm/vmalloc.c
	mm/vmscan.c
	mm/vmstat.c
	scripts/Kbuild.include

Change-Id: I91e2d85c07320c7ccfc04cf98a448e89bed6ade6
Fix mistakes in merge

Change-Id: Ib92c3067dec28605e8905daddc44a667683bebc7
mm: Update Samsung's -cma shit to match 3.0.64

Samsung forked compaction and page_alloc to
compaction-cma and page_alloc-cma - fix stuff
that breaks.  We may need to update more later.

Change-Id: I8325611e4e41af22688553a835dbc490c70793e1
bcmdhd: kang from d2

Change-Id: I16a99ec34895212fecbafa13fdb714158b476dad
config: Regenerate for new bcmdhd driver

Change-Id: Ic290661cf04c03a10e444d0ee8b1b6c713470e78
wireless backport from 3.4

Courtesy of Brian Beloshapka (bbelos)

Change-Id: I4b0a8d591bfe57c9f69943ecaf2fa80e772fde8e
WIFI: Use kernel version 3.4 ifdef's.

Change-Id: I7f8414839e2205dff8939cab6739789633e31204
Merge branch 'cm-10.1-experimental' into HEAD
smdk4412: mali: merge with r3p1 driver from note8

Change-Id: I75db69081b986ec326fe347f73aa3655648e6b81
block: add row iosched

Change-Id: I01857784f0506a0b443dd01c801908e0beea5f66
smdk4412: enable row iosched

Change-Id: I67f753a0702f224c6202247d0fd500c719326a96
block: add sio iosched

Change-Id: Iaa76975d4635d2f5c560d39fbf23919410e7e64f
smdk4412: enable sio iosched

Change-Id: Ic5d7355620b6762b6a6b0e39d8fb895c119d1dce
i9300: reenable dock support

Change-Id: Ifed3eefcbc081b3cdde4082ec86c8a39a2a3071a
i9305: Enable car dock

Change-Id: I210846d796a04daf844924129626f4b9ca0ed1ec
t0lte: enable support for car dock

Change-Id: I3a8ffe754b222d553975ca0ea85489f8f71bdbbd
t0ltecdma: enable support for car dock

Change-Id: I7f0e89e533f7d639d88da16bd56ccc931eb36ad7
update bcmdhd driver from GT-9505 Source

drivers pulled from http://review.cyanogenmod.org/#/c/36122/

Change-Id: Ide4aef99ee1d594f4222ae69aca0bdb7d563e80a
Correct md5sum executable on OSX hosts

On OSX hosts the md5sum executable is called md5 instead.

Change-Id: I0b8e3ab137136be6e45fd4b9f77f2c036e8b981a
migrate: fix merge fail

Change-Id: Ic7caec90cd2c7bb977040d4e416016ca36ee4eea