| author | Tony Lindgren <tony@atomide.com> | |
| Fri, 16 Dec 2011 22:00:23 +0000 (14:00 -0800) | ||
| committer | Tony Lindgren <tony@atomide.com> | |
| Fri, 16 Dec 2011 22:00:23 +0000 (14:00 -0800) | ||
| commit | 9d297f5ee1b92a84e2cd6c547c3ac1f893128359 | |
| tree | cff90b5421967f17d11a7611a9c5f0fca0be4d67 | tree | snapshot (tar.xz tar.gz zip) |
| parent | aacf094128759cfb29a3ce88f92d08b79b74a4e8 | commit | diff |
| parent | 2f31b51659c2d8315ea2888ba5b93076febe672b | commit | diff |
Merge branch 'tk_prm_chain_handler_devel_3.3' of git://git.pwsan.com/linux-2.6 into prcm
Conflicts:
arch/arm/mach-omap2/Makefile
Conflicts:
arch/arm/mach-omap2/Makefile