git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Olof Johansson <olof@lixom.net>
	Mon, 1 Oct 2012 21:33:55 +0000 (14:33 -0700)
committer	Olof Johansson <olof@lixom.net>
	Mon, 1 Oct 2012 21:33:55 +0000 (14:33 -0700)
commit	f77b48cda74c1d72f803be703453a07cf0c52569
tree	cf140e1dfd5754aef0a59003cf9266aad003b8f5	tree \| snapshot
parent	305533fc4b0750593d2f493ce7ecefc66ad3b07f	commit \| diff
parent	96b6a7b2a3eeac8338b349c926bee1a193d39755	commit \| diff

Merge branch 'next/drivers' into HEAD

Conflicts:
arch/arm/boot/dts/omap4.dtsi
arch/arm/mach-clps711x/common.c
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap1/board-h3.c
arch/arm/mach-omap1/leds-h2p2-debug.c
arch/arm/mach-omap1/leds.c
arch/arm/mach-pnx4008/time.c
arch/arm/plat-omap/debug-leds.c
drivers/Makefile
drivers/bus/omap_l3_noc.c

34 files changed:

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/omap4.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/Makefile	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/at91sam9rl_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-clps711x/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/clock-exynos5.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/include/mach/map.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-integrator/core.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-osk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_eb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pb1176.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pb11mp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pba8.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pbx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shark/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/tegra20_clocks_data.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/tegra30_clocks_data.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-versatile/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/debug-leds.c	diff1 \|	diff2 \|	blob \| history
drivers/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/bus/omap_l3_noc.c	\|	diff2 \|	blob \| history
drivers/gpio/gpio-samsung.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/omap4.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/Makefile	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/at91sam9rl_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-clps711x/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/clock-exynos5.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/include/mach/map.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-integrator/core.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-osk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_eb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pb1176.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pb11mp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pba8.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pbx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shark/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/tegra20_clocks_data.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/tegra30_clocks_data.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-versatile/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/debug-leds.c	diff1 \|	diff2 \|	blob \| history
drivers/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/bus/omap_l3_noc.c	\|	diff2 \|	blob \| history
drivers/gpio/gpio-samsung.c	diff1 \|	diff2 \|	blob \| history