diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 23:33:55 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 23:33:55 +0200 |
| commit | 8b1a13b02812b60b88920801363920956691feb3 (patch) | |
| tree | cf140e1dfd5754aef0a59003cf9266aad003b8f5 /arch/arm/configs/cns3420vb_defconfig | |
| parent | Merge branch 'next/soc2' into HEAD (diff) | |
| parent | Merge branch 'samsung/pinctrl' into next/drivers (diff) | |
| download | linux-8b1a13b02812b60b88920801363920956691feb3.tar.xz linux-8b1a13b02812b60b88920801363920956691feb3.zip | |
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
Diffstat (limited to 'arch/arm/configs/cns3420vb_defconfig')
0 files changed, 0 insertions, 0 deletions