git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	Arnd Bergmann <arnd@arndb.de>
	Mon, 9 Jan 2012 16:16:29 +0000 (16:16 +0000)
committer	Arnd Bergmann <arnd@arndb.de>
	Mon, 9 Jan 2012 16:16:29 +0000 (16:16 +0000)
commit	dcf7ec5ee62a78123057a1e286c88ca739717409
tree	fa3f19434638a942ba66d236dde4d9aaadf8b370	tree \| snapshot
parent	15db3e823c3246e3bd31fe454f5c8927eb85caf2	commit \| diff
parent	142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6	commit \| diff

Merge branch 'samsung/driver' into next/drivers

Conflicts:
arch/arm/mach-mxs/include/mach/common.h

Pull in previous samsung conflict merges and do a trivial
merge of an mxs double-add conflict.

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

55 files changed:

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/include/mach/map.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-origen.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-smdkv310.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/aspenite.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/avengers_lite.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/brownstone.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/flint.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/gplugd.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/include/mach/pxa168.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/pxa168.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/tavorevb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/teton_bga.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/ttc_dkb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/include/mach/common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/mach-mx28evk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-4430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-am3517evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/balloon3.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/capc7117.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/colibri-pxa270.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/colibri-pxa300.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/colibri-pxa320.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/corgi.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/em-x270.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/eseries.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/hx4700.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/icontrol.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/idp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/littleton.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/lpd270.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/lubbock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/magician.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/mainstone.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/mioa701.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/poodle.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/raumfeld.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-pxa/spitz.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/stargate2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/tavorevb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/tavorevb3.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/tosa.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/viper.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/vpac270.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-pxa/zylonite.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-sa1100/generic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/plat/irqs.h	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/include/mach/map.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-origen.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-smdkv310.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/aspenite.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/avengers_lite.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/brownstone.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/flint.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/gplugd.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/include/mach/pxa168.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/pxa168.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/tavorevb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/teton_bga.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/ttc_dkb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/include/mach/common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/mach-mx28evk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-4430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-am3517evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/balloon3.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/capc7117.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/colibri-pxa270.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/colibri-pxa300.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/colibri-pxa320.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/corgi.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/em-x270.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/eseries.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/hx4700.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/icontrol.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/idp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/littleton.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/lpd270.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/lubbock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/magician.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/mainstone.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/mioa701.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/poodle.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/raumfeld.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-pxa/spitz.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/stargate2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/tavorevb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/tavorevb3.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/tosa.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/viper.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/vpac270.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-pxa/zylonite.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-sa1100/generic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/plat/irqs.h	diff1 \|	diff2 \|	blob \| history