]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6a3d883 4520c86)
Merge branch 'next/dt' into HEAD
authorOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:23:11 +0000 (14:23 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:23:11 +0000 (14:23 -0700)
commita4d1dbc033de8a3f18fe6a721d63dd96d878511d
tree86fecf07ae1f01ba8bac5969974a7915b738baeetree | snapshot
parent6a3d8835b524570124c781fab06ed9ddcfeded43commit | diff
parent4520c863631a8480f37e884e24af671b05ae2971commit | diff
Merge branch 'next/dt' into HEAD

Conflicts:
Documentation/devicetree/bindings/usb/platform-uhci.txt
arch/arm/mach-vt8500/bv07.c
arch/arm/mach-vt8500/devices-vt8500.c
arch/arm/mach-vt8500/devices-wm8505.c
arch/arm/mach-vt8500/devices.c
arch/arm/mach-vt8500/devices.h
arch/arm/mach-vt8500/wm8505_7in.c
17 files changed:
Documentation/devicetree/bindings/vendor-prefixes.txt diff1 | diff2 | blob | history
arch/arm/Kconfig diff1 | diff2 | blob | history
arch/arm/boot/dts/imx27-phytec-phycore.dts diff1 | diff2 | blob | history
arch/arm/mach-dove/common.c diff1 | diff2 | blob | history
arch/arm/mach-imx/Makefile diff1 | diff2 | blob | history
arch/arm/mach-mmp/mmp2.c diff1 | diff2 | blob | history
arch/arm/mach-mmp/pxa910.c diff1 | diff2 | blob | history
arch/arm/mach-mxs/mach-mxs.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/omap4-common.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/omap_hwmod.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/timer.c diff1 | diff2 | blob | history
arch/arm/mach-ux500/board-mop500.c diff1 | diff2 | blob | history
arch/arm/mach-ux500/cpu-db8500.c diff1 | diff2 | blob | history
arch/arm/plat-omap/include/plat/omap_hwmod.h diff1 | diff2 | blob | history
arch/arm/plat-omap/omap_device.c diff1 | diff2 | blob | history
drivers/clk/Makefile diff1 | diff2 | blob | history
drivers/gpio/gpio-samsung.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.