git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Russell King <rmk+kernel@arm.linux.org.uk>
	Sun, 28 Aug 2011 09:41:19 +0000 (10:41 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Sun, 28 Aug 2011 09:41:19 +0000 (10:41 +0100)
commit	3ad29450aa243a318fae5d50bdc918760436bb02
tree	6f9c3ced3cf155924ab97cfdc73c1b0055b71f4a	tree \| snapshot
parent	453d801856805de90c04eb36a7bf225a73490cd4	commit \| diff
parent	ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893	commit \| diff

Merge branch 'devel-stable' into for-next

Conflicts:
arch/arm/mach-imx/mach-cpuimx27.c
arch/arm/mach-msm/board-msm7x30.c
arch/arm/mm/dma-mapping.c

60 files changed:

arch/arm/include/asm/dma-mapping.h	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/memory.h	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.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-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-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/lpd270.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/mainstone.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/saar.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/saarb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rpc/riscpc.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

Linux kernel for KaRo TX COM modules

RSS Atom

arch/arm/include/asm/dma-mapping.h	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/memory.h	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.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-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-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/lpd270.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/mainstone.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/saar.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/saarb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rpc/riscpc.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