Merge changeset f6f0a6d6a7258eff41fd202fc70df18271a2de79

Conflicts:
	net/Makefile
Merge changeset 5d70f79b5ef6ea2de4f72a37b2d96e2601e40a22
Merge changeset 4a60cfa9457749f7987fd4f3c956dbba5a281129
Merge changeset 092e0e7e520a1fca03e13c9f2d157432a8657ff2

Conflicts:
	arch/arm/kernel/debug.S
	arch/arm/kernel/head.S
	arch/arm/mm/cache-v7.S
	kernel/power/process.c
Merge changeset a8cbf22559ceefdcdfac00701e8e6da7518b7e8e

Conflicts:
	kernel/power/process.c
Merge changeset 7f9c7e28119cf21ae1a035240da3705647d0d06a

Conflicts:
	arch/arm/mach-at91/include/mach/system.h
	arch/arm/mach-imx/mach-cpuimx27.c
Merge changeset 79a94c3538bda6869d7bb150b5e02dd3a72314dd

Conflicts:
	arch/arm/mach-at91/include/mach/system.h
	arch/arm/mach-imx/mach-cpuimx27.c
Merge changeset 23beab76b490172a9ff3d52843e4d27a35b2a4c6

Conflicts:
	arch/arm/mm/cache-v7.S
Merge changeset a0a55682b83fd5f012afadcf415b030d7424ae68

Conflicts:
	arch/arm/kernel/head.S
Merge commit 'd71e3eb5894dbb626dc7e28cfd4f33ebee9a739a'
Merge commit '1ea64615601229f0dc16dee91dc5b50216411baa'

Conflicts:
	arch/arm/kernel/debug.S
Merge branch 'partial2' into forward

Conflicts:
	arch/arm/kernel/debug.S
	arch/arm/kernel/head.S
Merge branch 'forward' into upstream

Conflicts:
	arch/arm/kernel/head.S
	arch/arm/mm/cache-v7.S