diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-12-16 14:00:23 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-12-16 14:00:23 -0800 |
| commit | 9d297f5ee1b92a84e2cd6c547c3ac1f893128359 (patch) | |
| tree | cff90b5421967f17d11a7611a9c5f0fca0be4d67 /scripts | |
| parent | aacf094128759cfb29a3ce88f92d08b79b74a4e8 (diff) | |
| parent | 2f31b51659c2d8315ea2888ba5b93076febe672b (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
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions