diff options
author | Michal Marek <mmarek@suse.cz> | 2010-10-12 15:09:06 +0200 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2010-10-12 15:09:06 +0200 |
commit | 239060b93bb30a4ad55f1ecaa512464a035cc5ba (patch) | |
tree | 77f79810e57d4fc24356eca0cd6db463e8994128 /Documentation/input/bcm5974.txt | |
parent | 1408b15b98635a13bad2e2a50b3c2ae2ccdf625b (diff) | |
parent | e9203c988234aa512bd45ca32b52e21c7bbfc414 (diff) | |
download | kernel_samsung_smdk4412-239060b93bb30a4ad55f1ecaa512464a035cc5ba.zip kernel_samsung_smdk4412-239060b93bb30a4ad55f1ecaa512464a035cc5ba.tar.gz kernel_samsung_smdk4412-239060b93bb30a4ad55f1ecaa512464a035cc5ba.tar.bz2 |
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
We need to revert the temporary hack in 71ebc01, hence the merge.
Diffstat (limited to 'Documentation/input/bcm5974.txt')
-rw-r--r-- | Documentation/input/bcm5974.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/input/bcm5974.txt b/Documentation/input/bcm5974.txt index 5e22dcf..74d3876 100644 --- a/Documentation/input/bcm5974.txt +++ b/Documentation/input/bcm5974.txt @@ -62,4 +62,4 @@ Links ----- [1] http://ubuntuforums.org/showthread.php?t=840040 -[2] http://http://bitmath.org/code/ +[2] http://bitmath.org/code/ |