| commit | fb8231a8b139035476f2a8aaac837d0099b66dad | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Tue Aug 10 13:22:08 2010 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Tue Aug 10 13:22:08 2010 +0200 |
| tree | 2875806beb96ea0cdab292146767a5085721dc6a | |
| parent | 426d31071ac476ea62c62656b242930c17b58c00 [diff] | |
| parent | f6cec0ae58c17522a7bc4e2f39dae19f199ab534 [diff] |
Merge branch 'master' into for-next Conflicts: arch/arm/mach-omap1/board-nokia770.c