Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
commitf25a6b4199afa4a6fc57b3dc83a9ce64c951bbf0
authorRalf Baechle <ralf@linux-mips.org>
Sun, 1 Oct 2006 19:31:47 +0000 (1 20:31 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Sun, 1 Oct 2006 19:31:47 +0000 (1 20:31 +0100)
tree531d86d75412b45f6996628ff016f2d61d579e7c
parentb44bfd96920482a40f941f78d67061494387b0be
parent4e9011d50d77ce7d234272e203235d8ecffd61a1
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
drivers/char/Kconfig
drivers/serial/ip22zilog.c
drivers/video/Kconfig
mm/memory.c