git.stricted.de - GitHub/moto-9609/android_kernel_motorola

projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit

author	Arnd Bergmann <arnd@arndb.de>
	Mon, 31 Oct 2011 22:11:46 +0000 (23:11 +0100)
committer	Arnd Bergmann <arnd@arndb.de>
	Mon, 31 Oct 2011 22:11:53 +0000 (23:11 +0100)
commit	5839fec9d8db35b2b07359b18a77295418e239ad
tree	f060f613c7d76b2784a93c96b7b8cd3f0d201254	tree \| snapshot (tar.gz zip)
parent	43872fa788060eef91ae437957e0a5e39f1c56fd	commit \| diff
parent	0cdc8b921d68817b687755b4f6ae20cd8ff1d026	commit \| diff

Merge branch 'depends/rmk/memory_h' into next/fixes

Fix up all conflicts between the memory.h cleanup and bug fixes.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

80 files changed:

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-da850-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/sleep.S	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/edb93xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/simone.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/snappercl15.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/mach-universal_c210.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-cpuimx27.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-cpuimx35.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-eukrea_cpuimx25.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx27ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-integrator/integrator_ap.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/dsmg600-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/fsg-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/nas100d-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/nslu2-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ks8695/board-acs5k.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ks8695/board-dsm320.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ks8695/board-micrel.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-lpc32xx/phy3250.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/board-msm7x27.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/board-msm7x30.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/board-qsd8x50.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/board-sapphire.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-nomadik/board-nhk8815.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-ams-delta.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-fsample.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-generic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-h2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-h3.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-htcherald.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-innovator.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-nokia770.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-osk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-palmte.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-palmtt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-palmz71.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-perseus2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-sx1.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-voiceblue.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-2430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-4430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-generic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-h4.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-ldp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/db88f5281-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/dns323-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/kurobox_pro-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/mv2120-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/rd88f5182-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/terastation_pro2-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/ts209-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/ts409-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/wnr854t-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/wrt350n-v2-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/balloon3.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/cm-x2xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/cm-x300.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/lpd270.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/mainstone.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/palmtreo.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/palmtx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/saarb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/z2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/zeus.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-smdk6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-ag5evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-ap4evb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-mackerel.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-u300/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/board-mop500.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/board-u5500.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-vexpress/v2m.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/dma-mapping.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/init.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-da850-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/sleep.S	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/edb93xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/simone.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/snappercl15.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/mach-universal_c210.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-cpuimx27.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-cpuimx35.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-eukrea_cpuimx25.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx27ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-integrator/integrator_ap.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/dsmg600-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/fsg-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/nas100d-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/nslu2-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ks8695/board-acs5k.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ks8695/board-dsm320.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ks8695/board-micrel.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-lpc32xx/phy3250.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/board-msm7x27.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/board-msm7x30.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/board-qsd8x50.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/board-sapphire.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-nomadik/board-nhk8815.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-ams-delta.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-fsample.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-generic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-h2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-h3.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-htcherald.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-innovator.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-nokia770.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-osk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-palmte.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-palmtt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-palmz71.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-perseus2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-sx1.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-voiceblue.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-2430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-4430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-generic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-h4.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-ldp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/db88f5281-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/dns323-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/kurobox_pro-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/mv2120-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/rd88f5182-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/terastation_pro2-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/ts209-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/ts409-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/wnr854t-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/wrt350n-v2-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/balloon3.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/cm-x2xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/cm-x300.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/lpd270.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/mainstone.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/palmtreo.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/palmtx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/saarb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/z2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/zeus.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-smdk6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-ag5evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-ap4evb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-mackerel.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-u300/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/board-mop500.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/board-u5500.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-vexpress/v2m.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/dma-mapping.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/init.c	diff1 \|	diff2 \|	blob \| history