Merge branch 'clk-omap-legacy' into clk-next

Browse source

Conflicts:
	arch/arm/mach-omap2/cclock3xxx_data.c

...

This commit is contained in:

Michael Turquette 2015-01-30 10:57:21 -08:00

parent 035a61c314 d6540b1937

commit fe76756052

16 changed files with 5548 additions and 3810 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

12

include/linux/clk/ti.h

View file