diff --git a/[refs] b/[refs] index 8caee6b63241..0d6dfc698b20 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e646c52cf0ee186ec50b41c4db8cf81500c8dd1 +refs/heads/master: a368a6a33b107d680e955c799e6e1e3d6b4bbe8a diff --git a/trunk/Documentation/clk.txt b/trunk/Documentation/clk.txt index 1943fae014fd..4274a546eb57 100644 --- a/trunk/Documentation/clk.txt +++ b/trunk/Documentation/clk.txt @@ -174,9 +174,9 @@ int clk_foo_enable(struct clk_hw *hw) }; Below is a matrix detailing which clk_ops are mandatory based upon the -hardware capbilities of that clock. A cell marked as "y" means +hardware capabilities of that clock. A cell marked as "y" means mandatory, a cell marked as "n" implies that either including that -callback is invalid or otherwise uneccesary. Empty cells are either +callback is invalid or otherwise unnecessary. Empty cells are either optional or must be evaluated on a case-by-case basis. clock hardware characteristics