]> git.baikalelectronics.ru Git - kernel.git/commit
Merge commit 'v2.6.35' into kbuild/kbuild
authorMichal Marek <mmarek@suse.cz>
Wed, 4 Aug 2010 11:59:13 +0000 (13:59 +0200)
committerMichal Marek <mmarek@suse.cz>
Wed, 4 Aug 2010 11:59:13 +0000 (13:59 +0200)
commit0023a3c54c0dee82aab0a4cd119ad33b7af97ca9
treea7de21b79340aeaa17c58126f6b801b82c77b53a
parentd7f281a2c89f2fb4a044e113b937dc1f7bd6295b
parentc406d9686ef1d925c0eeb81c25acf2225c05c139
Merge commit 'v2.6.35' into kbuild/kbuild

Conflicts:
arch/powerpc/Makefile
Makefile
arch/blackfin/Makefile
arch/ia64/Makefile
arch/mips/Makefile
arch/powerpc/Makefile
arch/s390/Makefile
lib/Kconfig.debug
scripts/mod/file2alias.c
scripts/mod/modpost.c