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

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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 Sep 2011 00:07:30 +0000 (10:07 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 Sep 2011 00:07:33 +0000 (10:07 +1000)
commit	4249756d4fa075331ddfb678789d2973a2f727ae
tree	6d57a876f0eca72daf0506f083f868d0b93c49ea	tree \| snapshot
parent	e19ad6e36c882bc9cc093bf9c3d529493517a0c1	commit \| diff
parent	bdb424537d00b036a695763c71068acce487b099	commit \| diff

Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
Documentation/devicetree/bindings/arm/l2cc.txt
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-msm/board-msm7x30.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-nuc93x/Makefile.boot
arch/arm/mach-u300/Makefile.boot
arch/arm/mm/cache-l2x0.c
arch/arm/mm/dma-mapping.c
arch/arm/plat-mxc/include/mach/gpio.h

100 files changed:

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/dma-mapping.h	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/mach/arch.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-at91/at91cap9_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91rm9200_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9260_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9261_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9263_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9g45_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/board-usb-a926x.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-clps711x/clep7312.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-clps711x/edb7211-arch.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-clps711x/fortunet.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-clps711x/p720t.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/da850.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/dm355.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/dm644x.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/dm646x.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-footbridge/cats-hw.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-footbridge/netwinder-hw.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx27ads.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-halibut.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/board-mahimahi.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-msm8x60.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-msm/board-trout.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/include/mach/gpio.h	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-prima2/prima2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/cm-x300.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/eseries.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/saarb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pb1176.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pbx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rpc/riscpc.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c2412/mach-smdk2413.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c2412/mach-vstms.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-sa1100/assabet.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-sa1100/simpad.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-harmony.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-paz00.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-trimslice.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-u300/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-u300/Makefile.boot	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-u300/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/board-mop500-pins.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/hotplug.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/dma-mapping.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/include/mach/gpio.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/dma-mapping.h	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/mach/arch.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-at91/at91cap9_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91rm9200_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9260_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9261_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9263_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9g45_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/board-usb-a926x.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-clps711x/clep7312.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-clps711x/edb7211-arch.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-clps711x/fortunet.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-clps711x/p720t.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/da850.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/dm355.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/dm644x.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/dm646x.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-footbridge/cats-hw.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-footbridge/netwinder-hw.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx27ads.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-halibut.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/board-mahimahi.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-msm8x60.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-msm/board-trout.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/include/mach/gpio.h	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-prima2/prima2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/cm-x300.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/eseries.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/saarb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pb1176.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pbx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rpc/riscpc.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c2412/mach-smdk2413.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c2412/mach-vstms.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-sa1100/assabet.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-sa1100/simpad.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-harmony.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-paz00.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-trimslice.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-u300/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-u300/Makefile.boot	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-u300/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/board-mop500-pins.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/hotplug.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/dma-mapping.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/include/mach/gpio.h	diff1 \|	diff2 \|	blob \| history