Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus

This commit is contained in:
Jiri Kosina 2011-05-23 12:49:25 +02:00
6300 changed files with 197536 additions and 86111 deletions

View file

@ -55,7 +55,7 @@ config SAMPLE_KFIFO
If in doubt, say "N" here.
config SAMPLE_KDB
tristate "Build kdb command exmaple -- loadable modules only"
tristate "Build kdb command example -- loadable modules only"
depends on KGDB_KDB && m
help
Build an example of how to dynamically add the hello