| commit | 8b1a13b02812b60b88920801363920956691feb3 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Mon Oct 01 14:33:55 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Mon Oct 01 14:33:55 2012 -0700 |
| tree | cf140e1dfd5754aef0a59003cf9266aad003b8f5 | |
| parent | 5c008d7029fcd12a9a54fa618781b71353f6c4bd [diff] | |
| parent | 04ef037c926ddb31088c976538e29eada4fd1490 [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