Merge commit 'v2.6.36' into kbuild/misc
authorMichal Marek <mmarek@suse.cz>
Wed, 27 Oct 2010 22:15:57 +0000 (00:15 +0200)
committerMichal Marek <mmarek@suse.cz>
Wed, 27 Oct 2010 22:15:57 +0000 (00:15 +0200)
Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge