Merge commit 'v2.6.35' into kbuild/kconfig

Conflicts:
	scripts/kconfig/Makefile
This commit is contained in:
Michal Marek 2010-08-04 14:05:07 +02:00
commit 7a996d3ab1
15241 changed files with 1249932 additions and 691793 deletions

View file

@ -96,7 +96,7 @@ Environment variables for 'silentoldconfig'
KCONFIG_NOSILENTUPDATE
--------------------------------------------------
If this variable has a non-blank value, it prevents silent kernel
config udpates (requires explicit updates).
config updates (requires explicit updates).
KCONFIG_AUTOCONFIG
--------------------------------------------------