Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... master-lightv2.6.25-ki0
| commit | 0b3b4736037b9776aaba3836cd3422a5e60bb2b4 | |
| author | Miguel Botón <waninkoko@gmail.com> | |
| Fri, 18 Apr 2008 21:11:59 +0000 (18 23:11 +0200) | ||
| committer | Miguel Botón <waninkoko@gmail.com> | |
| Fri, 18 Apr 2008 21:11:59 +0000 (18 23:11 +0200) | ||
| tree | 0a10e9f2fcb975b6573c04b4f5eb7d06cf2c79fe | treesnapshot (tar.gz zip) |
| parent | 535eed92a43d4b2e1d397349830963624b80cfe1 | commitdiff |
| parent | 2cca775baecbfede2fec20c99add709232311fe7 | commitdiff |
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6 into master-light
Conflicts:
arch/x86/boot/compressed/misc.c
arch/x86/kernel/cpu/Makefile
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/proc.c
arch/x86/kernel/early_printk.c
arch/x86/kernel/setup_64.c
arch/x86/kernel/smpboot.c
drivers/misc/Makefile
Conflicts:
arch/x86/boot/compressed/misc.c
arch/x86/kernel/cpu/Makefile
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/proc.c
arch/x86/kernel/early_printk.c
arch/x86/kernel/setup_64.c
arch/x86/kernel/smpboot.c
drivers/misc/Makefile
34 files changed: