| commit | f4eb51b909144550048b7922ebd1904a54005394 | |
| author | Tony Lindgren <tony@atomide.com> | |
| Mon, 19 May 2008 19:02:14 +0000 (19 12:02 -0700) | ||
| committer | Tony Lindgren <tony@atomide.com> | |
| Mon, 19 May 2008 19:02:14 +0000 (19 12:02 -0700) | ||
| tree | 88c9f65cdfc77f68bd938ba843ce455f3f0404ba | treesnapshot (tar.gz zip) |
| parent | fe2c08002adea304a13ccb806aa1ab4058607094 | commitdiff |
| parent | b8291ad07a7f3b5b990900f0001198ac23ba893e | commitdiff |
Merge current mainline tree into linux-omap tree
Merge branches 'master' and 'linus'
Conflicts:
arch/arm/mach-omap2/clock.c
arch/arm/mach-omap2/clock34xx.h
arch/arm/plat-omap/dma.c
Merge branches 'master' and 'linus'
Conflicts:
arch/arm/mach-omap2/clock.c
arch/arm/mach-omap2/clock34xx.h
arch/arm/plat-omap/dma.c