]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Mon, 20 Oct 2008 02:17:52 +0000 (11:17 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 20 Oct 2008 02:17:52 +0000 (11:17 +0900)
commit4d33379b9b83867338b5068381d0aada006b9b2e
treedb3d7519932549bf528f5b8e4cb8350356cd544d
parentff5c34acae5739cfeef5697b49e24f6a9fbcc0de
parentb7ce261485158d9ce158de689d8db6844d95d614
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

Documentation/kernel-parameters.txt
arch/sh/include/asm/elf.h
Documentation/kernel-parameters.txt
arch/sh/include/asm/elf.h
arch/sh/kernel/smp.c
drivers/net/sh_eth.c
drivers/rtc/rtc-sh.c