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
commit 366a2382c6
6300 changed files with 197978 additions and 86553 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

View file

@ -19,7 +19,7 @@
*
* This file is a kernel module that places a breakpoint over ksym_name kernel
* variable using Hardware Breakpoint register. The corresponding handler which
* prints a backtrace is invoked everytime a write operation is performed on
* prints a backtrace is invoked every time a write operation is performed on
* that variable.
*
* Copyright (C) IBM Corporation, 2009